From 830644e7d0b688d8f940d93675437c94151c7c3c Mon Sep 17 00:00:00 2001
From: Jef <jackefransham@gmail.com>
Date: Tue, 19 Feb 2019 15:44:04 +0100
Subject: [PATCH] Remove printlns, make `push`ing stack arguments work properly

---
 src/backend.rs            | 26 +++++++++++++++++---------
 src/translate_sections.rs |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/backend.rs b/src/backend.rs
index 417f0210cb..cd31708e79 100644
--- a/src/backend.rs
+++ b/src/backend.rs
@@ -1372,19 +1372,31 @@ impl<M: ModuleContext> Context<'_, M> {
     store!(i64_store, Rq, QWORD, "i64.store");
 
     fn push_physical(&mut self, value: ValueLocation) -> ValueLocation {
+        self.block_state.depth.reserve(1);
         match value {
             ValueLocation::Reg(gpr) => {
-                self.block_state.depth.reserve(1);
                 // TODO: Proper stack allocation scheme
                 dynasm!(self.asm
                     ; push Rq(gpr)
                 );
                 self.block_state.regs.release_scratch_gpr(gpr);
-
-                ValueLocation::Stack(-(self.block_state.depth.0 as i32))
             }
-            value => value,
+            ValueLocation::Stack(o) => {
+                let offset = self.adjusted_offset(o);
+                dynasm!(self.asm
+                    ; push QWORD [rsp + offset]
+                );
+            }
+            ValueLocation::Immediate(imm) => {
+                let gpr = self.block_state.regs.take_scratch_gpr();
+                dynasm!(self.asm
+                    ; mov Rq(gpr), QWORD imm
+                    ; push Rq(gpr)
+                );
+                self.block_state.regs.release_scratch_gpr(gpr);
+            }
         }
+        ValueLocation::Stack(-(self.block_state.depth.0 as i32))
     }
 
     fn push(&mut self, value: ValueLocation) {
@@ -1823,13 +1835,11 @@ impl<M: ModuleContext> Context<'_, M> {
         for &loc in out_locs.iter().rev() {
             let val = self.pop();
 
-            println!("{:?}", loc);
-
             match loc {
                 CCLoc::Stack(offset) => {
                     let offset = self.adjusted_offset(offset as i32 - depth as i32);
 
-                    if offset == -1 {
+                    if offset == -(WORD_SIZE as i32) {
                         self.push_physical(val);
                     } else {
                         let gpr = self.into_reg(val);
@@ -1856,8 +1866,6 @@ impl<M: ModuleContext> Context<'_, M> {
         while !pending.is_empty() {
             try_count -= 1;
 
-            println!("{:?}", self.block_state);
-
             if try_count == 0 {
                 unimplemented!("We can't handle cycles in the register allocation right now");
             }
diff --git a/src/translate_sections.rs b/src/translate_sections.rs
index 64b765ca0c..b024bab772 100644
--- a/src/translate_sections.rs
+++ b/src/translate_sections.rs
@@ -129,7 +129,7 @@ pub fn code(
             &body,
         );
 
-        if true {
+        if false {
             let mut microwasm = vec![];
 
             let mut microwasm_conv = MicrowasmConv::new(