aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/c-util.boot2
-rw-r--r--src/interp/g-opt.boot1
-rw-r--r--src/interp/g-util.boot2
-rw-r--r--src/interp/lisp-backend.boot2
-rw-r--r--src/interp/macros.lisp4
-rw-r--r--src/interp/slam.boot4
-rw-r--r--src/interp/sys-macros.lisp16
-rw-r--r--src/interp/vmlisp.lisp45
8 files changed, 17 insertions, 59 deletions
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index d0c24e38..38a24387 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -345,7 +345,7 @@ declareUnusedParameters x == (augment x; x) where
devaluate d ==
not vector? d => d
categoryObject? d => canonicalForm d
- QVSIZE d > 0 =>
+ #d > 0 =>
d' := canonicalForm d
isFunctor d' => d'
d
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index fedbc988..775b3b8a 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -640,6 +640,7 @@ $VMsideEffectFreeOperators ==
%ilength %ibit %icst0 %icst1 %icstmin %icstmax
%imul %iadd %isub %igcd %ilcm %ipow %imin %imax %ieven? %iodd? %iinc
%idec %irem %iquo %idivide %idec %irandom %imulmod %iaddmod %isubmod
+ %ilshift %irshift
%feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax %float?
%fpowi %fdiv %fneg %i2f %fminval %fmaxval %fbase %fprec %ftrunc
%fsqrt %fpowf %flog %flog2 %flog10 %fmanexp %fNaN? %fdecode
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 9ed9468b..6d8d41d7 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -830,7 +830,7 @@ mergeSort(f,g,p,n) ==
q := rest t
t.rest := nil
p := mergeSort(f,g,p,l)
- q := mergeSort(f,g,q,QSDIFFERENCE(n,l))
+ q := mergeSort(f,g,q,n-l)
mergeInPlace(f,g,p,q)
--% Throwing with glorious highlighting (maybe)
diff --git a/src/interp/lisp-backend.boot b/src/interp/lisp-backend.boot
index 684810ca..4ad86732 100644
--- a/src/interp/lisp-backend.boot
+++ b/src/interp/lisp-backend.boot
@@ -535,6 +535,8 @@ for x in [
['%imul, :"*"],
['%imulf, :"*"], -- integer * float
['%irem, :'REM],
+ ['%ilshift, :'ASH],
+ ['%irshift, :'ASH],
['%iquo, :'TRUNCATE],
['%ipow, :'EXPT],
['%isub, :"-"],
diff --git a/src/interp/macros.lisp b/src/interp/macros.lisp
index 8f59e445..227533d5 100644
--- a/src/interp/macros.lisp
+++ b/src/interp/macros.lisp
@@ -147,7 +147,7 @@
(declare (simple-vector vec))
(let ((n (position 0 vec :from-end t :test-not #'eql)))
(cond ((null n) (vector))
- ((eql n (qvmaxindex vec)) vec)
+ ((eql n (maxindex vec)) vec)
(t (subseq vec 0 (+ n 1))))))
; 14 SEQUENCES
@@ -441,7 +441,7 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size
((EQL |l| 0) NIL)
('T (SPADLET |n| 0) (SPADLET |word| '||)
(SPADLET |inWord| NIL)
- (DO ((|i| 0 (1+ |i|))) ((QSGREATERP |i| |l|) NIL)
+ (DO ((|i| 0 (1+ |i|))) ((> |i| |l|) NIL)
(declare (fixnum |i|))
(SEQ (EXIT (COND
((eql (aref |str| |i|) #\space)
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index 28a74f08..159be089 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -335,10 +335,10 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
phrase1:= [['%and,["%LET",max,["ELT",stateVar,0]],['%ige,sharpArg,max]],
[auxfn,:argl,stateVar]]
phrase2:= [['%igt,sharpArg,['%store,max,["DIFFERENCE",max,k]]],
- ["ELT",stateVar,['%iinc,["QSDIFFERENCE",k,["DIFFERENCE",sharpArg,max]]]]]
+ ["ELT",stateVar,['%iinc,["%isub",k,["DIFFERENCE",sharpArg,max]]]]]
phrase3:= [['%igt,sharpArg,n],[auxfn,:argl,['%list,n,:initCode]]]
phrase4:= [['%igt,sharpArg,n-k],
- ["ELT",['%list,:initCode],["QSDIFFERENCE",n,sharpArg]]]
+ ["ELT",['%list,:initCode],["%isub",n,sharpArg]]]
phrase5:= ['%otherwise,['recurrenceError,MKQ op,sharpArg]]
['PROGN,:preset,['%when,phrase1,phrase2,phrase3,phrase4,phrase5]]
if $verbose then
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp
index 8e949642..39d0385e 100644
--- a/src/interp/sys-macros.lisp
+++ b/src/interp/sys-macros.lisp
@@ -512,7 +512,7 @@
(defun MKQSADD1 (X)
(COND ((ATOM X)
`(1+ ,X))
- ((AND (member (CAR X) '(-DIFFERENCE QSDIFFERENCE -) :test #'eq)
+ ((AND (member (CAR X) '(-DIFFERENCE |%isub| -) :test #'eq)
(EQL 1 (CADDR X)))
(CADR X))
(`(1+ ,X))))
@@ -605,19 +605,19 @@
;; If CADDDR U is not an atom, only compute the value once
(PUSH
(if (INTEGERP INC)
- (LIST (if (QSMINUSP INC)
- 'QSLESSP
- 'QSGREATERP)
+ (LIST (if (MINUSP INC)
+ '<
+ '>)
(CAR U)
FINAL)
- `(if (QSMINUSP ,INC)
- (QSLESSP ,(CAR U) ,FINAL)
- (QSGREATERP ,(CAR U) ,FINAL)))
+ `(if (MINUSP ,INC)
+ (< ,(CAR U) ,FINAL)
+ (> ,(CAR U) ,FINAL)))
XCL)))
(PUSH (LIST (CAR U) (CADR U)
(COND ((|member| INC '(1 (|One|)))
(MKQSADD1 (CAR U)))
- ((LIST 'QSPLUS (CAR U) INC)) ))
+ ((LIST '+ (CAR U) INC)) ))
IL))
(ON
(PUSH (LIST 'ATOM (CAR U)) XCL)
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 322ce4ae..b124403f 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -217,48 +217,6 @@
`(,(rcqexp pattern) ,exp)
(macro-invalidargs 'qrplq form "form must be updateable.")))
-(defmacro qsdifference (x y)
- `(the fixnum (- (the fixnum ,x) (the fixnum ,y))))
-
-(defmacro qsgreaterp (a b)
- `(> (the fixnum ,a) (the fixnum ,b)))
-
-(defmacro qsleftshift (a b)
- `(the fixnum (ash (the fixnum ,a) (the fixnum ,b))))
-
-(defmacro qslessp (a b)
- `(< (the fixnum ,a) (the fixnum ,b)))
-
-(defmacro qsmax (x y)
- `(the fixnum (max (the fixnum ,x) (the fixnum ,y))))
-
-(defmacro qsmin (x y)
- `(the fixnum (min (the fixnum ,x) (the fixnum ,y))))
-
-(defmacro qsminus (x)
- `(the fixnum (minus (the fixnum ,x))))
-
-(defmacro qsminusp (x)
- `(minusp (the fixnum ,x)))
-
-(defmacro qsoddp (x)
- `(oddp (the fixnum ,x)))
-
-(defmacro qsabsval (x)
- `(the fixnum (abs (the fixnum ,x))))
-
-(defmacro qsplus (x y)
- `(the fixnum (+ (the fixnum ,x) (the fixnum ,y))))
-
-(defmacro qszerop (x)
- `(zerop (the fixnum ,x)))
-
-(defmacro qvmaxindex (x)
- `(the fixnum (1- (the fixnum (length (the simple-vector ,x))))))
-
-(defmacro qvsize (x)
- `(the fixnum (length (the simple-vector ,x))))
-
(defmacro resetq (a b)
`(prog1 ,a (setq ,a ,b)))
@@ -295,9 +253,6 @@
(defmacro times (&rest args)
`(* ,@args))
-(defmacro zero? (x)
- `(and (typep ,x 'fixnum) (zerop (the fixnum ,x))))
-
;; defuns
(define-function 'tempus-fugit #'get-internal-run-time)