continuing to try cleaning up

This commit is contained in:
Danny Yoo 2011-09-06 16:56:34 -04:00
parent 386b2575e2
commit 8d0df44458
2 changed files with 14 additions and 10 deletions

View File

@ -282,11 +282,11 @@
(let ([target (AssignImmediateStatement-target second-stmt)]) (let ([target (AssignImmediateStatement-target second-stmt)])
(cond (cond
[(equal? target (make-EnvLexicalReference 0 #f)) [(equal? target (make-EnvLexicalReference 0 #f))
(cons (make-PushImmediateOntoEnvironment (loop (cons (make-PushImmediateOntoEnvironment
(adjust-oparg-depth (adjust-oparg-depth
(AssignImmediateStatement-value second-stmt) -1) (AssignImmediateStatement-value second-stmt) -1)
#f) #f)
(loop (rest (rest statements))))] (rest (rest statements))))]
[else [else
(default)]))] (default)]))]

View File

@ -268,7 +268,8 @@ EOF
[(Label? target) [(Label? target)
(cond (cond
[(set-contains? entry-points (Label-name target)) [(set-contains? entry-points (Label-name target))
(default stmt)] (display (assemble-statement stmt) op)
'ok]
[else [else
(log-debug (format "Assembling inlined jump into ~a" (Label-name target)) ) (log-debug (format "Assembling inlined jump into ~a" (Label-name target)) )
(assemble-block-statements (BasicBlock-name (assemble-block-statements (BasicBlock-name
@ -279,12 +280,15 @@ EOF
entry-points entry-points
op)])] op)])]
[(Reg? target) [(Reg? target)
(default stmt)] (display (assemble-statement stmt) op)
'ok]
[(ModuleEntry? target) [(ModuleEntry? target)
(default stmt)] (display (assemble-statement stmt) op)
'ok]
[(CompiledProcedureEntry? target) [(CompiledProcedureEntry? target)
(default stmt)])] (display (assemble-statement stmt) op)
'ok])]
[(PushControlFrame/Generic? stmt) [(PushControlFrame/Generic? stmt)
(default stmt)] (default stmt)]