diff --git a/04_Machine_Language/Makefile b/04_Machine_Language/Makefile index 34aa8bd..1d018e2 100644 --- a/04_Machine_Language/Makefile +++ b/04_Machine_Language/Makefile @@ -1,12 +1,14 @@ +PYTHON = /bin/python3.11 + leds: - ../tools/Assembler/assembler.pyc leds.asm + $(PYTHON) ../tools/Assembler/assembler.pyc leds.asm cp leds.hack ../05_Computer_Architecture/04_HACK/ROM.hack mult: - ../tools/Assembler/assembler.pyc mult.asm + $(PYTHON) ../tools/Assembler/assembler.pyc mult.asm cp mult.hack ../05_Computer_Architecture/04_HACK/ROM.hack upload: - ../tools/Assembler/assembler.pyc leds.asm - ../tools/AsciiToBin.py leds.hack + $(PYTHON) ../tools/Assembler/assembler.pyc leds.asm + $(PYTHON) ../tools/AsciiToBin.py leds.hack iceprogduino -o 64k -w leds.bin clean: rm -f *.hack *~ *.bin diff --git a/06_IO_Devices/01_UartTX/Makefile b/06_IO_Devices/01_UartTX/Makefile index 9a48181..8620548 100644 --- a/06_IO_Devices/01_UartTX/Makefile +++ b/06_IO_Devices/01_UartTX/Makefile @@ -1,9 +1,11 @@ +PYTHON = /bin/python3.11 + NAME = hello all: asm install asm: - ../../tools/Assembler/assembler.pyc $(NAME).asm + $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm install: cp $(NAME).hack ../00_HACK/ROM.hack clean: diff --git a/06_IO_Devices/02_UartRX/Makefile b/06_IO_Devices/02_UartRX/Makefile index 0a47836..eae21f1 100644 --- a/06_IO_Devices/02_UartRX/Makefile +++ b/06_IO_Devices/02_UartRX/Makefile @@ -1,9 +1,11 @@ +PYTHON = /bin/python3.11 + NAME = echo all: asm install asm: - ../../tools/Assembler/assembler.pyc $(NAME).asm + $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm install: cp $(NAME).hack ../00_HACK/ROM.hack clean: diff --git a/06_IO_Devices/03_SPI/Makefile b/06_IO_Devices/03_SPI/Makefile index 2f8c32f..1ba9f7e 100644 --- a/06_IO_Devices/03_SPI/Makefile +++ b/06_IO_Devices/03_SPI/Makefile @@ -1,9 +1,11 @@ +PYTHON = /bin/python3.11 + NAME = cat all: asm install asm: - ../../tools/Assembler/assembler.pyc $(NAME).asm + $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm install: cp $(NAME).hack ../00_HACK/ROM.hack clean: diff --git a/06_IO_Devices/04_SRAM/Makefile b/06_IO_Devices/04_SRAM/Makefile index a75d001..e83502d 100644 --- a/06_IO_Devices/04_SRAM/Makefile +++ b/06_IO_Devices/04_SRAM/Makefile @@ -1,9 +1,11 @@ +PYTHON = /bin/python3.11 + NAME = buffer all: asm install asm: - ../../tools/Assembler/assembler.pyc $(NAME).asm + $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm install: cp $(NAME).hack ../00_HACK/ROM.hack clean: diff --git a/06_IO_Devices/05_GO/Makefile b/06_IO_Devices/05_GO/Makefile index 465dad0..441ca8c 100644 --- a/06_IO_Devices/05_GO/Makefile +++ b/06_IO_Devices/05_GO/Makefile @@ -1,9 +1,11 @@ +PYTHON = /bin/python3.11 + NAME = boot all: asm install asm: - ../../tools/Assembler/assembler.pyc $(NAME).asm + $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm install: cp $(NAME).hack ../00_HACK/ROM.hack clean: diff --git a/07_Operating_System/01_GPIO_Test/Makefile b/07_Operating_System/01_GPIO_Test/Makefile index 29614ad..3594777 100644 --- a/07_Operating_System/01_GPIO_Test/Makefile +++ b/07_Operating_System/01_GPIO_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = /bin/python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/02_UART_Test/Makefile b/07_Operating_System/02_UART_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/02_UART_Test/Makefile +++ b/07_Operating_System/02_UART_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/03_Sys_Test/Makefile b/07_Operating_System/03_Sys_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/03_Sys_Test/Makefile +++ b/07_Operating_System/03_Sys_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/04_Memory_Test/Makefile b/07_Operating_System/04_Memory_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/04_Memory_Test/Makefile +++ b/07_Operating_System/04_Memory_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/05_Array_Test/Makefile b/07_Operating_System/05_Array_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/05_Array_Test/Makefile +++ b/07_Operating_System/05_Array_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/06_Math_Test/Makefile b/07_Operating_System/06_Math_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/06_Math_Test/Makefile +++ b/07_Operating_System/06_Math_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/07_String_Test/Makefile b/07_Operating_System/07_String_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/07_String_Test/Makefile +++ b/07_Operating_System/07_String_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/08_StdIO_Test/Makefile b/07_Operating_System/08_StdIO_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/08_StdIO_Test/Makefile +++ b/07_Operating_System/08_StdIO_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/09_Screen_Test/Makefile b/07_Operating_System/09_Screen_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/09_Screen_Test/Makefile +++ b/07_Operating_System/09_Screen_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/10_Output_Test/Makefile b/07_Operating_System/10_Output_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/10_Output_Test/Makefile +++ b/07_Operating_System/10_Output_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/11_Touch_Test/Makefile b/07_Operating_System/11_Touch_Test/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/11_Touch_Test/Makefile +++ b/07_Operating_System/11_Touch_Test/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/07_Operating_System/12_Tetris/Makefile b/07_Operating_System/12_Tetris/Makefile index 29614ad..50a597d 100644 --- a/07_Operating_System/12_Tetris/Makefile +++ b/07_Operating_System/12_Tetris/Makefile @@ -1,13 +1,15 @@ +PYTHON = python3.11 + all: jack vm asm bin sim jack: - ../../tools/JackCompiler/JackCompiler.pyc ./ + $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./ vm: - ../../tools/VMTranslator/VMTranslator.pyc ./ + $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./ asm: - ../../tools/Assembler/assembler.pyc out.asm + $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm bin: - ../../tools/AsciiToBin.py out.hack + $(PYTHON) ../../tools/AsciiToBin.py out.hack sim: cp out.hack ../00_HACK/ROM.hack upload: diff --git a/Revision.md b/Revision.md index 9d5c220..e4662a1 100644 --- a/Revision.md +++ b/Revision.md @@ -1,17 +1,32 @@ # Revision V2.0 +## update 04.08.2023 + +### update tools to python3.11: + +- `tools/Assembler/assembler.pyc`: update tools to python 3.11 +- `tools/Jack/JackCompiler.pyc`: update tools to python 3.11 +- `tools/Jack/VMTranslator.pyc`: update tools to python 3.11 + +### corrected: + +- corrected diagramms: leds.png, mult.png + ## update 18.10.2022 ### correct typos: + * `Hack/CPU.v`: Replace `loadM` with `writeM` * update diagramms ### update tools to python3.10: + * `tools/Assembler/assembler.pyc`: update tools to python 3.10 * `tools/Jack/JackCompiler.pyc`: update tools to python 3.10 * `tools/Jack/VMTranslator.pyc`: update tools to python 3.10 ### update Jack-OS: + * `Jack/UART.jack`: replace `init()` with `init(int addr)` ### wierd behaviour of iCE40HX8K-EVB: @@ -21,10 +36,13 @@ * `Hack/Clock.v`: 25MHz? ### iceprog: programmer.ino + * set default to `bridge` (led green on). ### consistency: + * `Hack/Reset.v`: ### boot from spi + * 04_Hack-FLASH diff --git a/tools/Assembler/assembler.pyc b/tools/Assembler/assembler.pyc index 49e4a7d..2362a30 100755 Binary files a/tools/Assembler/assembler.pyc and b/tools/Assembler/assembler.pyc differ diff --git a/tools/Assembler/code.pyc b/tools/Assembler/code.pyc index 5d6635c..bbede6b 100644 Binary files a/tools/Assembler/code.pyc and b/tools/Assembler/code.pyc differ diff --git a/tools/Assembler/parser.pyc b/tools/Assembler/parser.pyc index 0ed86ef..00d221f 100644 Binary files a/tools/Assembler/parser.pyc and b/tools/Assembler/parser.pyc differ diff --git a/tools/Assembler/symbolTable.pyc b/tools/Assembler/symbolTable.pyc index 6897c99..d1818ff 100644 Binary files a/tools/Assembler/symbolTable.pyc and b/tools/Assembler/symbolTable.pyc differ diff --git a/tools/JackCompiler/CompilationEngine.pyc b/tools/JackCompiler/CompilationEngine.pyc index 984b580..8e01276 100644 Binary files a/tools/JackCompiler/CompilationEngine.pyc and b/tools/JackCompiler/CompilationEngine.pyc differ diff --git a/tools/JackCompiler/JackAnalyser.pyc b/tools/JackCompiler/JackAnalyser.pyc index d589e74..59a6df8 100755 Binary files a/tools/JackCompiler/JackAnalyser.pyc and b/tools/JackCompiler/JackAnalyser.pyc differ diff --git a/tools/JackCompiler/JackCompiler.pyc b/tools/JackCompiler/JackCompiler.pyc index 88b00ae..d27e8e7 100755 Binary files a/tools/JackCompiler/JackCompiler.pyc and b/tools/JackCompiler/JackCompiler.pyc differ diff --git a/tools/JackCompiler/JackTokenizer.pyc b/tools/JackCompiler/JackTokenizer.pyc index b2d2d1e..02d28e3 100644 Binary files a/tools/JackCompiler/JackTokenizer.pyc and b/tools/JackCompiler/JackTokenizer.pyc differ diff --git a/tools/JackCompiler/SymbolTable.pyc b/tools/JackCompiler/SymbolTable.pyc index a4e557c..cdf4d20 100644 Binary files a/tools/JackCompiler/SymbolTable.pyc and b/tools/JackCompiler/SymbolTable.pyc differ diff --git a/tools/JackCompiler/VMCodeWriter.pyc b/tools/JackCompiler/VMCodeWriter.pyc index 723f542..7f78959 100644 Binary files a/tools/JackCompiler/VMCodeWriter.pyc and b/tools/JackCompiler/VMCodeWriter.pyc differ diff --git a/tools/VMTranslator/VMTranslator.pyc b/tools/VMTranslator/VMTranslator.pyc index 8cc497a..39eaec6 100755 Binary files a/tools/VMTranslator/VMTranslator.pyc and b/tools/VMTranslator/VMTranslator.pyc differ diff --git a/tools/VMTranslator/codeWriter.pyc b/tools/VMTranslator/codeWriter.pyc index 25ced8c..ec2ec4f 100644 Binary files a/tools/VMTranslator/codeWriter.pyc and b/tools/VMTranslator/codeWriter.pyc differ diff --git a/tools/VMTranslator/parser.pyc b/tools/VMTranslator/parser.pyc index 644ac75..7ab434f 100644 Binary files a/tools/VMTranslator/parser.pyc and b/tools/VMTranslator/parser.pyc differ