aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-08-15 03:39:45 +0000
committerdos-reis <gdr@axiomatics.org>2011-08-15 03:39:45 +0000
commitc26813e72c730d6b1efdf6aa59a27f168390bb8a (patch)
tree4df7bd4462cd8701d49de301cab87e6c10b0055a /src/interp
parentc905e8d266fc00dea354654a426782c7daa2bbb9 (diff)
downloadopen-axiom-c26813e72c730d6b1efdf6aa59a27f168390bb8a.tar.gz
* interp/g-opt.boot (optCollectVector): Generate VM forms.
(optIinc): New. Register as new transformer. * interp/c-util.boot ($middleEndMacroList): Remove. (middleEndExpand): Don't check for Lisp-level macros anymore.
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/c-util.boot10
-rw-r--r--src/interp/g-opt.boot27
2 files changed, 19 insertions, 18 deletions
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index db2c8554..9b633a04 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -1202,23 +1202,15 @@ mutateBindingFormWithUnaryFunction(form,fun) ==
--%
-++ List of macros used by the middle end to represent some
-++ high level control structures.
--- NOTE: It is potentially dangerous to assume every occurrence of
--- element of $middleEndMacroList is actually a macro call
-$middleEndMacroList ==
- '(COLLECT REPEAT SUCHTHATCLAUSE THETA THETA1 SPADREDUCE SPADDO)
-
--middleEndExpand: %Form -> %Code
middleEndExpand x ==
+ x is '%void => '"" -- NIL would have caused havoc elsewhere
x is '%false or x is '%nil => 'NIL
ident? x and (x' := x has %Rename) => x'
atomic? x => x
[op,:args] := x
ident? op and (fun := getOpcodeExpander op) =>
middleEndExpand apply(fun,x,nil)
- symbol? op and symbolMember?(op,$middleEndMacroList) =>
- middleEndExpand MACROEXPAND_-1 x
a := middleEndExpand op
b := middleEndExpand args
sameObject?(a,op) and sameObject?(b,args) => x
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index f644ddda..f7dfa3f2 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -428,7 +428,8 @@ $VMsideEffectFreeOperators ==
%bitvecnot %bitvecand %bitvecnand %bivecor %bitvecnor %bitvecxor
%bitveccopy %bitvecconc %bitveclength %bitvecref %bitveceq %bitveclt
%before? %equal %sptreq %ident? %property %tref
- %writeString %writeNewline %writeLine)
+ %writeString %writeNewline %writeLine
+ %void)
++ List of simple VM operators
$simpleVMoperators ==
@@ -618,8 +619,8 @@ optCollectVector form ==
index := nil -- loop/vector index.
for iter in iters while not fromList repeat
[op,:.] := iter
- op in '(SUCHTHAT WHILE UNTIL) => fromList := true
- op in '(IN ON) => vecSize := [["SIZE",third iter],:vecSize]
+ op in '(| SUCHTHAT WHILE UNTIL) => fromList := true
+ op in '(IN ON) => vecSize := [['%llength,third iter],:vecSize]
op in '(STEP ISTEP) =>
-- pick a loop variable that we can use as the loop index.
[.,var,lo,inc,:etc] := iter
@@ -631,11 +632,11 @@ optCollectVector form ==
sz :=
inc = 1 =>
lo = 1 => hi
- lo = 0 => MKQSADD1 hi
- MKQSADD1 ["-",hi,lo]
- lo = 1 => ["/",hi,inc]
- lo = 0 => ["/",MKQSADD1 hi,inc]
- ["/",["-",MKQSADD1 hi, lo],inc]
+ lo = 0 => ['%iinc,hi]
+ ['%iinc,['%isub,hi,lo]]
+ lo = 1 => ['%idiv,hi,inc]
+ lo = 0 => ['%idiv,['%iinc,hi],inc]
+ ['%idiv,['%isub,['%iinc,hi], lo],inc]
vecSize := [sz, :vecSize]
systemErrorHere ["optCollectVector", iter]
-- if we draw from a list, then just build a list and convert to vector.
@@ -645,7 +646,7 @@ optCollectVector form ==
-- get the actual size of the vector.
vecSize :=
vecSize is [hi] => hi
- ["MIN",:reverse! vecSize]
+ ['%imin,:reverse! vecSize]
-- if no suitable loop index was found, introduce one.
if index = nil then
index := gensym()
@@ -745,6 +746,13 @@ optIadd(x is ['%iadd,a,b]) ==
integer? b and b = 0 => a
x
+optIinc(x is ['%iinc,a]) ==
+ a is [op,b,c] and op in '(%isub %iadd) =>
+ integer? b => simplifyVMForm [op,[op,b,1],c]
+ integer? c => simplifyVMForm [op,b,[op,c,1]]
+ x
+ x
+
optIsub(x is ['%isub,a,b]) ==
integer? a and integer? b => a - b
integer? a and a = 0 => ['%ineg,b]
@@ -791,6 +799,7 @@ for x in '((%call optCall) _
(%ige optIge)_
(%ineg optIneg)_
(%iadd optIadd)_
+ (%iinc optIinc)_
(%isub optIsub)_
(%irem optIrem)_
(%iquo optIquo)_