diff --git a/assembly/ppc/arith.lisp b/assembly/ppc/arith.lisp index 7f1c8841e89783b2c76939056908ea3d2f646e6c..af9df7c519b89f32a73a8572f0160e98e3a69c80 100644 --- a/assembly/ppc/arith.lisp +++ b/assembly/ppc/arith.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/ppc/arith.lisp,v 1.6 2005/12/11 18:30:45 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/ppc/arith.lisp,v 1.7 2005/12/11 20:30:45 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -62,7 +62,6 @@ (inst li nargs (fixnumize 2)) (inst mr ocfp cfp-tn) (inst mr cfp-tn csp-tn) - ;; (inst j lip 0) (inst j lip (- (* function-code-offset word-bytes) function-pointer-type)) DONE @@ -111,7 +110,6 @@ (inst li nargs (fixnumize 2)) (inst mr ocfp cfp-tn) (inst mr cfp-tn csp-tn) - ;;(inst j lip 0) (inst j lip (- (* function-code-offset word-bytes) function-pointer-type)) DONE @@ -189,7 +187,6 @@ (inst li nargs (fixnumize 2)) (inst mr ocfp cfp-tn) (inst mr cfp-tn csp-tn) - ;;(inst j lip 0) (inst j lip (- (* function-code-offset word-bytes) function-pointer-type)) LOW-FITS-IN-FIXNUM @@ -322,7 +319,6 @@ (inst li nargs (fixnumize 2)) (inst mr ocfp cfp-tn) (inst mr cfp-tn csp-tn) - ;;(inst j lip 0) (inst j lip (- (* function-code-offset word-bytes) function-pointer-type)) @@ -369,7 +365,6 @@ (inst li nargs (fixnumize 2)) (inst mr ocfp cfp-tn) (inst mr cfp-tn csp-tn) - ;;(inst j lip 0) (inst j lip (- (* function-code-offset word-bytes) function-pointer-type)) RETURN-T @@ -406,7 +401,6 @@ (inst li nargs (fixnumize 2)) (inst mr ocfp cfp-tn) (inst mr cfp-tn csp-tn) - ;;(inst j lip 0) (inst j lip (- (* function-code-offset word-bytes) function-pointer-type)) RETURN-T @@ -440,7 +434,6 @@ (inst lwz lip null-tn (static-function-offset 'two-arg-=)) (inst li nargs (fixnumize 2)) (inst mr ocfp cfp-tn) - ;;(inst j lip 0) (inst mr cfp-tn csp-tn) (inst j lip (- (* function-code-offset word-bytes) function-pointer-type)) diff --git a/compiler/generic/new-genesis.lisp b/compiler/generic/new-genesis.lisp index 4adc21ce8532cfced5cec3256d80364bf510ceb5..5f7316ba28655316158b27d33df155e084773bd4 100644 --- a/compiler/generic/new-genesis.lisp +++ b/compiler/generic/new-genesis.lisp @@ -4,7 +4,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/new-genesis.lisp,v 1.76 2005/12/11 18:30:47 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/new-genesis.lisp,v 1.77 2005/12/11 20:30:46 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -909,8 +909,7 @@ (ecase type (#.vm:function-header-type (if (or (c:backend-featurep :sparc) - (and (c:backend-featurep :ppc) - #+nil (c:backend-featurep :ppc-fun-hack))) + (c:backend-featurep :ppc)) defn (make-random-descriptor (+ (logandc2 (descriptor-bits defn) vm:lowtag-mask) diff --git a/compiler/ppc/cell.lisp b/compiler/ppc/cell.lisp index 6cff635cc1a3be1d32a5483c7c4031bf9e66aabc..ccd9de0dc63d547992843ba976f3f52a84baf153 100644 --- a/compiler/ppc/cell.lisp +++ b/compiler/ppc/cell.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/cell.lisp,v 1.6 2005/12/11 18:30:47 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ppc/cell.lisp,v 1.7 2005/12/11 20:30:46 rtoy Rel $") ;;; ;;; ********************************************************************** ;;; @@ -140,10 +140,6 @@ (let ((normal-fn (gen-label))) (load-type type function (- function-pointer-type)) (inst cmpwi type function-header-type) - #+nil - (inst addi lip function - (- (ash vm:function-code-offset vm:word-shift) - function-pointer-type)) (move lip function) (inst beq normal-fn) ;; For the linkage-table stuff, we need to look up the address diff --git a/lisp/ppc-assem.S b/lisp/ppc-assem.S index a7405b9de7de165be88048a52128c7a0e33585af..1f61c30c94b9305b2de483d9a6d11aebbd15a0d2 100644 --- a/lisp/ppc-assem.S +++ b/lisp/ppc-assem.S @@ -197,16 +197,12 @@ x: li reg_A3,0 li reg_L0,0 li reg_L1,0 -/* li reg_L2,0*/ li reg_LIP,0 lis reg_NULL,hi16(NIL) ori reg_NULL,reg_NULL,lo16(NIL) /* Turn on pseudo-atomic */ -#if 0 - li reg_NL3,-4 -#endif li reg_ALLOC,4 store(reg_ZERO,reg_NL4,_foreign_function_call_active) load(reg_NL4,_current_dynamic_space_free_pointer) @@ -306,9 +302,6 @@ lra: mr reg_NARGS,reg_NL3 /* Turn on pseudo-atomic */ -#if 0 - li reg_NL3,-4 -#endif la reg_ALLOC,4(reg_ALLOC) /* Convert the return address to an offset and save it on the stack. */ @@ -362,7 +355,6 @@ lra: li reg_A3,0 li reg_L0,0 li reg_L1,0 -/* li reg_L2,0*/ li reg_LIP,0 /* Atomic ... */ @@ -408,16 +400,6 @@ lra: GFUNCDEF(xundefined_tramp) .globl _undefined_tramp -#if 0 - .byte 0,0,0,type_FunctionHeader /* Header */ - - .long _undefined_tramp /* self slot */ - .long NIL /* next slot */ - .long NIL /* name slot */ - .long NIL /* arglist slot */ - .long NIL /* type slot */ -_undefined_tramp: -#else .byte 0 _undefined_tramp: .byte 0, 0, type_FunctionHeader @@ -426,7 +408,7 @@ _undefined_tramp: .long NIL /* name slot */ .long NIL /* arglist slot */ .long NIL /* type slot */ -#endif + twllei reg_ZERO,trap_Cerror /* Number of argument bytes */ .byte 4 @@ -453,15 +435,6 @@ _undefined_tramp: GFUNCDEF(xclosure_tramp) .globl _closure_tramp -#if 0 - .byte 0,0,0,type_FunctionHeader /* Header */ - .long _closure_tramp - .long NIL - .long NIL - .long NIL - .long NIL -_closure_tramp: -#else .byte 0 _closure_tramp: .byte 0,0,type_FunctionHeader /* Header */ @@ -470,7 +443,7 @@ _closure_tramp: .long NIL .long NIL .long NIL -#endif + lwz reg_LEXENV,FDEFN_FUNCTION_OFFSET(reg_FDEFN) lwz reg_CODE,CLOSURE_FUNCTION_OFFSET(reg_LEXENV) la reg_LIP,FUNCTION_CODE_OFFSET(reg_CODE)