--- gforth/prim	2003/01/01 17:28:29	1.112
+++ gforth/prim	2003/01/08 10:25:34	1.117
@@ -1473,31 +1473,8 @@ f_addr = (Float *)((((Cell)c_addr)+(size
 :
  [ 1 floats 1- ] Literal + [ -1 floats ] Literal and ;
 
->body	( xt -- a_addr )	core	to_body
-"" Get the address of the body of the word represented by @i{xt} (the address
-of the word's data field).""
-a_addr = PFA(xt);
-:
-    2 cells + ;
-
 \ threading stuff is currently only interesting if we have a compiler
 \fhas? standardthreading has? compiler and [IF]
-
->code-address	( xt -- c_addr )		gforth	to_code_address
-""@i{c-addr} is the code address of the word @i{xt}.""
-/* !! This behaves installation-dependently for DOES-words */
-c_addr = (Address)CODE_ADDRESS(xt);
-:
-    @ ;
-
->does-code	( xt -- a_addr )		gforth	to_does_code
-""If @i{xt} is the execution token of a child of a @code{DOES>} word,
-@i{a-addr} is the start of the Forth code after the @code{DOES>};
-Otherwise @i{a-addr} is 0.""
-a_addr = (Cell *)DOES_CODE(xt);
-:
-    cell+ @ ;
-
 code-address!	( c_addr xt -- )		gforth	code_address_store
 ""Create a code field with code address @i{c-addr} at @i{xt}.""
 MAKE_CF(xt, c_addr);
@@ -1886,10 +1863,11 @@ flag = FLAG(!fnmatch(pattern, string, 0)
 newline	( -- c_addr u )	gforth
 ""String containing the newline sequence of the host OS""
 char newline[] = {
-#if defined(unix) || defined(__MACH__)
-/* Darwin/MacOS X sets __MACH__, but not unix. */
+#if DIRSEP=='/'
+/* Unix */
 '\n'
 #else
+/* DOS, Win, OS/2 */
 '\r','\n'
 #endif
 };
@@ -1941,7 +1919,11 @@ comparisons(f0, r, f_zero_, r, 0., float
 d>f	( d -- r )		float	d_to_f
 #ifdef BUGGY_LONG_LONG
 extern double ldexp(double x, int exp);
-r = ldexp((Float)d.hi,CELL_BITS) + (Float)d.lo;
+if (d.hi<0) {
+  DCell d2=dnegate(d);
+  r = -(ldexp((Float)d2.hi,CELL_BITS) + (Float)d2.lo);
+} else
+  r = ldexp((Float)d.hi,CELL_BITS) + (Float)d.lo;
 #else
 r = d;
 #endif
@@ -2482,7 +2464,7 @@ f = forget_dyncode(c_code);
 decompile-prim ( a_code -- a_prim ) gforth-internal decompile_prim
 ""a_prim is the code address of the primitive that has been
 compile_prim1ed to a_code""
-a_prim = decompile_code(a_code);
+a_prim = (Label)decompile_code((Label)a_code);
 
 \+