changed python tools to python3.11

2023-08-04 16:44:31 +02:00 · 2023-08-04 16:44:31 +02:00 · b16bfcfd43
commit b16bfcfd43
parent f476ed8da2
32 changed files with 111 additions and 57 deletions
--- 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
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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
--- a/tools/Assembler/assembler.pyc
+++ b/tools/Assembler/assembler.pyc
--- a/tools/Assembler/code.pyc
+++ b/tools/Assembler/code.pyc
--- a/tools/Assembler/parser.pyc
+++ b/tools/Assembler/parser.pyc
--- a/tools/Assembler/symbolTable.pyc
+++ b/tools/Assembler/symbolTable.pyc
--- a/tools/JackCompiler/CompilationEngine.pyc
+++ b/tools/JackCompiler/CompilationEngine.pyc
--- a/tools/JackCompiler/JackAnalyser.pyc
+++ b/tools/JackCompiler/JackAnalyser.pyc
--- a/tools/JackCompiler/JackCompiler.pyc
+++ b/tools/JackCompiler/JackCompiler.pyc
--- a/tools/JackCompiler/JackTokenizer.pyc
+++ b/tools/JackCompiler/JackTokenizer.pyc
--- a/tools/JackCompiler/SymbolTable.pyc
+++ b/tools/JackCompiler/SymbolTable.pyc
--- a/tools/JackCompiler/VMCodeWriter.pyc
+++ b/tools/JackCompiler/VMCodeWriter.pyc
--- a/tools/VMTranslator/VMTranslator.pyc
+++ b/tools/VMTranslator/VMTranslator.pyc
--- a/tools/VMTranslator/codeWriter.pyc
+++ b/tools/VMTranslator/codeWriter.pyc
--- a/tools/VMTranslator/parser.pyc
+++ b/tools/VMTranslator/parser.pyc