[Sbcl-commits] CVS: sbcl/src/runtime gc-common.c,1.18.2.1,1.18.2.2 thread.c,1.31.4.2,1.31.4.3

[Juho S. <js...@us...>]

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19567/src/runtime

Modified Files:
      Tag: x86-64-again-branch
	gc-common.c thread.c 
Log Message:
0.8.15.14.x86-64-again-branch.8:
        * Change arg-type of comparison vops specialized for
          signed/unsigned constants to (...-byte 31) from 32 in
          order to avoid sign extension of the immediates.
        * Fix bitvector reading (4 -> n-word-bytes, :dword -> :qword).
        * Add rex-prefix in random-arith-ops even if src is constant
          and target is accumulator-p.
        * Remove some legacy instructions that are invalid in 64 bit mode.
        * Comment out bogus instruction printers so that the disassembler
          doesn't crash.
        * Oops. change #ifdef FOO || BAR to #if defined(FOO) || defined(BAR)


Index: gc-common.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/gc-common.c,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- gc-common.c	8 Nov 2004 17:50:42 -0000	1.18.2.1
+++ gc-common.c	17 Nov 2004 06:00:30 -0000	1.18.2.2
@@ -302,7 +302,7 @@
 		
 	/* fix self pointer. */
 	nfheaderp->self =
-#ifdef LISP_FEATURE_X86 || LISP_FEATURE_X86_64
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
 	    FUN_RAW_ADDR_OFFSET +
 #endif
 	    nfheaderl; 
@@ -417,7 +417,7 @@
  * objects don't move, we don't need to update anything, but we do
  * have to figure out that the function is still live. */
 
-#ifdef LISP_FEATURE_X86 || LISP_FEATURE_X86_64
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
 static int
 scav_closure_header(lispobj *where, lispobj object)
 {
@@ -437,7 +437,7 @@
 }
 #endif
 
-#ifndef LISP_FEATURE_X86 || LISP_FEATURE_X86_64
+#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
 static int
 scav_fun_header(lispobj *where, lispobj object)
 {
@@ -1635,7 +1635,7 @@
     scavtab[SIMPLE_FUN_HEADER_WIDETAG] = scav_fun_header;
     scavtab[RETURN_PC_HEADER_WIDETAG] = scav_return_pc_header;
 #endif
-#ifdef LISP_FEATURE_X86 || LISP_FEATURE_X86_64
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
     scavtab[CLOSURE_HEADER_WIDETAG] = scav_closure_header;
     scavtab[FUNCALLABLE_INSTANCE_HEADER_WIDETAG] = scav_closure_header;
 #else

Index: thread.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/thread.c,v
retrieving revision 1.31.4.2
retrieving revision 1.31.4.3
diff -u -d -r1.31.4.2 -r1.31.4.3
--- thread.c	8 Nov 2004 17:50:42 -0000	1.31.4.2
+++ thread.c	17 Nov 2004 06:00:30 -0000	1.31.4.3
@@ -145,7 +145,7 @@
 #else
     th->alien_stack_pointer=((void *)th->alien_stack_start);
 #endif
-#ifdef LISP_FEATURE_X86 || defined (LISP_FEATURE_X86_64)
+#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64)
     th->pseudo_atomic_interrupted=0;
     th->pseudo_atomic_atomic=0;
 #endif