From ec61018d15ba4ad0a41e1ab44d7e1ecb5f2870d2 Mon Sep 17 00:00:00 2001
From: Yuchen Pei <me@ypei.me>
Date: Tue, 12 Dec 2017 14:30:43 +0100
Subject: finished project 4

---
 projects/04/mult/Mult.asm | 33 +++++++++++++++++++++++++++++++++
 projects/04/mult/Mult.out |  7 +++++++
 projects/04/mult/Mult.tst |  2 +-
 projects/04/mult/mult.asm |  9 ---------
 4 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 projects/04/mult/Mult.asm
 create mode 100644 projects/04/mult/Mult.out
 delete mode 100644 projects/04/mult/mult.asm

(limited to 'projects/04/mult')

diff --git a/projects/04/mult/Mult.asm b/projects/04/mult/Mult.asm
new file mode 100644
index 0000000..50bbba0
--- /dev/null
+++ b/projects/04/mult/Mult.asm
@@ -0,0 +1,33 @@
+// This file is part of www.nand2tetris.org
+// and the book "The Elements of Computing Systems"
+// by Nisan and Schocken, MIT Press.
+// File name: projects/04/Mult.asm
+
+// Multiplies R0 and R1 and stores the result in R2.
+// (R0, R1, R2 refer to RAM[0], RAM[1], and RAM[2], respectively.)
+
+// Put your code here.
+
+@i
+M=0
+@R2
+M=0
+
+(LOOP)
+@i
+M=M+1
+D=M
+@R0
+D=D-M
+@END
+D;JGT
+@R1
+D=M
+@R2
+M=M+D
+@LOOP
+0;JMP
+
+(END)
+@END
+0;JMP
diff --git a/projects/04/mult/Mult.out b/projects/04/mult/Mult.out
new file mode 100644
index 0000000..e31b5df
--- /dev/null
+++ b/projects/04/mult/Mult.out
@@ -0,0 +1,7 @@
+|  RAM[0]  |  RAM[1]  |  RAM[2]  |
+|       0  |       0  |       0  |
+|       1  |       0  |       0  |
+|       0  |       2  |       0  |
+|       3  |       1  |       3  |
+|       2  |       4  |       8  |
+|       6  |       7  |      42  |
diff --git a/projects/04/mult/Mult.tst b/projects/04/mult/Mult.tst
index f877664..9bf4fa8 100644
--- a/projects/04/mult/Mult.tst
+++ b/projects/04/mult/Mult.tst
@@ -3,7 +3,7 @@
 // by Nisan and Schocken, MIT Press.
 // File name: projects/04/mult/Mult.tst
 
-load Mult.hack,
+load Mult.asm,
 output-file Mult.out,
 compare-to Mult.cmp,
 output-list RAM[0]%D2.6.2 RAM[1]%D2.6.2 RAM[2]%D2.6.2;
diff --git a/projects/04/mult/mult.asm b/projects/04/mult/mult.asm
deleted file mode 100644
index b44440a..0000000
--- a/projects/04/mult/mult.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is part of www.nand2tetris.org
-// and the book "The Elements of Computing Systems"
-// by Nisan and Schocken, MIT Press.
-// File name: projects/04/Mult.asm
-
-// Multiplies R0 and R1 and stores the result in R2.
-// (R0, R1, R2 refer to RAM[0], RAM[1], and RAM[2], respectively.)
-
-// Put your code here.
\ No newline at end of file
-- 
cgit v1.2.3