From 4e2796decd37f5b07a1be0da08aaa6f5b28142b5 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Tue, 19 Dec 2017 20:43:40 +0100 Subject: testing checkpoint --- projects/06/Assembler | Bin 65896 -> 22320 bytes projects/06/Assembler.hs | 8 +++++--- projects/06/Assembler.o | Bin 76496 -> 9560 bytes 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/06/Assembler b/projects/06/Assembler index 7cd3b78..b19cc81 100755 Binary files a/projects/06/Assembler and b/projects/06/Assembler differ diff --git a/projects/06/Assembler.hs b/projects/06/Assembler.hs index 28f506d..3583121 100644 --- a/projects/06/Assembler.hs +++ b/projects/06/Assembler.hs @@ -88,6 +88,8 @@ parseCode code = mconcat $ parseLine (addSyms codeWithoutJunk 0 16 initTable) <$ where codeWithoutJunk = stripJunk code codeWithoutLabels = stripLabels codeWithoutJunk -main = do - code <- getContents - putStr $ parseCode code +code0 = "// This file is part of www.nand2tetris.org\n// and the book \"The Elements of Computing Systems\"\n// by Nisan and Schocken, MIT Press.\n// File name: projects/06/add/Add.asm\n\n// Computes R0 = 2 + 3 (R0 refers to RAM[0])\n\n@2\nD=A\n@3\nD=D+A\n@0\nM=D" + +--main = do + --code <- getContents + --putStr $ parseCode code diff --git a/projects/06/Assembler.o b/projects/06/Assembler.o index 09d8785..c10385e 100644 Binary files a/projects/06/Assembler.o and b/projects/06/Assembler.o differ -- cgit v1.2.3