[Bug-openmcl] problem with clx and %store-node-conditional

[Gary Byers]

On Wed, 21 Jan 2004, Timothy Moore wrote:

> Hi,
> This seems to be a regression of a problem I reported in November,
> which was fixed quickly. I used the 031220 image to build CVS (non
> bleeding edge.) When starting a CLX application (McCLIM, for example),
> the code hangs in clx' deallocate-event. Again, I'm pretty sure that
> the problem is in ccl::%store-node-conditional.  Let me know if I can
> supply any additional data.
>
> Tim
>
> _______________________________________________
> Bug-openmcl mailing list
> Bug-openmcl at clozure.com
> http://clozure.com/mailman/listinfo/bug-openmcl
>
>

Well, the good news is that it's only a partial regression: things
got clobbered again, but not quite as badly.  (Still badly enough
to cause havoc, but not quite as much havoc ...)
-------------- next part --------------
Index: ppc-symbol.lisp
===================================================================
RCS file: /usr/local/tmpcvs/ccl-0.14/ccl/level-0/PPC/ppc-symbol.lisp,v
retrieving revision 1.4
diff -u -r1.4 ppc-symbol.lisp
--- ppc-symbol.lisp	20 Dec 2003 08:40:45 -0000	1.4
+++ ppc-symbol.lisp	21 Jan 2004 23:02:49 -0000
@@ -79,8 +79,8 @@
   (bge @sym)
   (lwzx temp0 imm4 imm3)
   (cmpwi temp0 ppc32::subtag-no-thread-local-binding)
-  (beq @sym)
   (slwi imm3 imm3 ppc32::fixnumshift)
+  (beq @sym)
   (vpush imm4)
   (vpush imm3)
   (set-nargs 2)
@@ -88,7 +88,7 @@
   (ba .SPvalues)
   @sym
   (lwz arg_z ppc32::svar.symbol svar)
-  (li arg_y 'ppc32::symbol.vcell)
+  (li arg_y '#.ppc32::symbol.vcell)
   (vpush arg_z)
   (vpush arg_y)
   (set-nargs 2)