Index: /trunk/ccl/compiler/PPC/ppc2.lisp
===================================================================
--- /trunk/ccl/compiler/PPC/ppc2.lisp	(revision 255)
+++ /trunk/ccl/compiler/PPC/ppc2.lisp	(revision 256)
@@ -1374,5 +1374,5 @@
                              (! double->heap target 0))
                            (if (and index-known-fixnum (<= index-known-fixnum ppc32::max-1-bit-constant-index))
-                             (! misc-ref-c-bit[fixnum] target src index-known-fixnum)
+                             (! misc-ref-c-bit-fixnum target src index-known-fixnum)
                              (with-imm-temps
                                  () (word-index bitnum dest)
@@ -1383,5 +1383,5 @@
                                    (! scale-1bit-misc-index word-index bitnum unscaled-idx))
                                  (! misc-ref-u32 dest src word-index)
-                                 (! extract-variable-bit[fixnum] target dest bitnum))))))))
+                                 (! extract-variable-bit-fixnum target dest bitnum))))))))
                   (^))))))))))
 
@@ -3426,5 +3426,5 @@
 ; If "value-first-p" is true and both "offset" and "val" need to be 
 ; evaluated, evaluate "val" before evaluating "offset".
-(defun ppc2-%immediate-set-ptr (seg vreg xfer deref ptr offset val value-first-p)
+(defun ppc2-%immediate-set-ptr (seg vreg xfer  ptr offset val value-first-p)
   (with-ppc-local-vinsn-macros (seg vreg xfer)
     (let* ((intval (acode-absolute-ptr-p val))
@@ -3466,6 +3466,4 @@
                     (setq val-target ppc::rzero)
                     (ppc2-lwi seg val-target intval))
-                  (if deref
-                    (! mem-ref-c-fullword ptr-reg ptr-reg 0))
                   (! mem-set-c-fullword val-target ptr-reg offval)
                   (if for-value
@@ -3478,6 +3476,4 @@
                       (! temp-pop-unboxed-word ptr-reg)
                       (ppc2-close-undo)
-                      (if deref
-                        (! mem-ref-c-fullword ptr-reg ptr-reg 0))
                       (! mem-set-c-fullword address ptr-reg offval)
                       (if for-value
@@ -3558,6 +3554,4 @@
                                   xval-reg address
                                   node-arg_z nil)))))))
-              (if deref
-                (! mem-ref-c-fullword xptr-reg xptr-reg 0))
               (! mem-set-fullword xval-reg xptr-reg xoff-reg)
               (when for-value
@@ -3590,5 +3584,5 @@
   (with-ppc-local-vinsn-macros (seg vreg xfer)
     (if (eql 0 (%ilogand #xf bits))
-      (ppc2-%immediate-set-ptr seg vreg xfer (%ilogbitp 4 bits) ptr offset val value-first-p)
+      (ppc2-%immediate-set-ptr seg vreg xfer  ptr offset val value-first-p)
       (let* ((deref (%ilogbitp 4 bits))
              (size
@@ -5233,5 +5227,5 @@
     (progn
       (ensuring-node-target (target vreg) 
-        (! extract-tag[fixnum] target (ppc2-one-untargeted-reg-form seg node ppc::arg_z)))
+        (! extract-tag-fixnum target (ppc2-one-untargeted-reg-form seg node ppc::arg_z)))
       (^))))
 
@@ -5241,5 +5235,5 @@
     (progn
       (ensuring-node-target (target vreg) 
-        (! extract-fulltag[fixnum] target (ppc2-one-untargeted-reg-form seg node ppc::arg_z)))
+        (! extract-fulltag-fixnum target (ppc2-one-untargeted-reg-form seg node ppc::arg_z)))
       (^))))
 
@@ -5250,5 +5244,5 @@
                                                          ppc::arg_y ppc::arg_z))))
       (ensuring-node-target (target vreg) 
-        (! extract-typecode[fixnum] target reg ))
+        (! extract-typecode-fixnum target reg ))
       (^))))
 
@@ -5306,5 +5300,5 @@
     (if vreg 
       (ensuring-node-target (target vreg)
-        (! misc-element-count[fixnum] target misc-reg)))
+        (! misc-element-count-fixnum target misc-reg)))
     (^)))
 
@@ -6288,5 +6282,5 @@
           (ppc2-one-targeted-reg-form seg ptr src-reg)
           (if (node-reg-p vreg)
-            (! mem-ref-c-bit[fixnum] vreg src-reg byte-index (logand 31 (+ bit-shift
+            (! mem-ref-c-bit-fixnum vreg src-reg byte-index (logand 31 (+ bit-shift
                                                                            ppc32::fixnumshift)))
             (with-imm-target ()           ;OK if src-reg & dest overlap
@@ -6307,5 +6301,5 @@
               (ppc2-close-undo))
             (if (node-reg-p vreg)
-              (! mem-ref-bit[fixnum] vreg src-reg offset-reg)
+              (! mem-ref-bit-fixnum vreg src-reg offset-reg)
               (with-imm-target ()
                 (dest :u8)