konarak/nand2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed python tools to python3.11

Browse Source
This commit is contained in:
Michael Schröder 2023-08-04 16:44:31 +02:00
parent f476ed8da2
commit b16bfcfd43
32 changed files with 111 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
04_Machine_Language/Makefile
View File

@ -1,12 +1,14 @@
PYTHON = /bin/python3.11
leds: leds:
../tools/Assembler/assembler.pyc leds.asm $(PYTHON) ../tools/Assembler/assembler.pyc leds.asm
cp leds.hack ../05_Computer_Architecture/04_HACK/ROM.hack cp leds.hack ../05_Computer_Architecture/04_HACK/ROM.hack
mult: mult:
../tools/Assembler/assembler.pyc mult.asm $(PYTHON) ../tools/Assembler/assembler.pyc mult.asm
cp mult.hack ../05_Computer_Architecture/04_HACK/ROM.hack cp mult.hack ../05_Computer_Architecture/04_HACK/ROM.hack
upload: upload:
../tools/Assembler/assembler.pyc leds.asm $(PYTHON) ../tools/Assembler/assembler.pyc leds.asm
../tools/AsciiToBin.py leds.hack $(PYTHON) ../tools/AsciiToBin.py leds.hack
iceprogduino -o 64k -w leds.bin iceprogduino -o 64k -w leds.bin
clean: clean:
rm -f *.hack *~ *.bin rm -f *.hack *~ *.bin

4
06_IO_Devices/01_UartTX/Makefile
View File

@ -1,9 +1,11 @@
PYTHON = /bin/python3.11
NAME = hello NAME = hello
all: asm install all: asm install
asm: asm:
../../tools/Assembler/assembler.pyc $(NAME).asm $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm
install: install:
cp $(NAME).hack ../00_HACK/ROM.hack cp $(NAME).hack ../00_HACK/ROM.hack
clean: clean:

4
06_IO_Devices/02_UartRX/Makefile
View File

@ -1,9 +1,11 @@
PYTHON = /bin/python3.11
NAME = echo NAME = echo
all: asm install all: asm install
asm: asm:
../../tools/Assembler/assembler.pyc $(NAME).asm $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm
install: install:
cp $(NAME).hack ../00_HACK/ROM.hack cp $(NAME).hack ../00_HACK/ROM.hack
clean: clean:

4
06_IO_Devices/03_SPI/Makefile
View File

@ -1,9 +1,11 @@
PYTHON = /bin/python3.11
NAME = cat NAME = cat
all: asm install all: asm install
asm: asm:
../../tools/Assembler/assembler.pyc $(NAME).asm $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm
install: install:
cp $(NAME).hack ../00_HACK/ROM.hack cp $(NAME).hack ../00_HACK/ROM.hack
clean: clean:

4
06_IO_Devices/04_SRAM/Makefile
View File

@ -1,9 +1,11 @@
PYTHON = /bin/python3.11
NAME = buffer NAME = buffer
all: asm install all: asm install
asm: asm:
../../tools/Assembler/assembler.pyc $(NAME).asm $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm
install: install:
cp $(NAME).hack ../00_HACK/ROM.hack cp $(NAME).hack ../00_HACK/ROM.hack
clean: clean:

4
06_IO_Devices/05_GO/Makefile
View File

@ -1,9 +1,11 @@
PYTHON = /bin/python3.11
NAME = boot NAME = boot
all: asm install all: asm install
asm: asm:
../../tools/Assembler/assembler.pyc $(NAME).asm $(PYTHON) ../../tools/Assembler/assembler.pyc $(NAME).asm
install: install:
cp $(NAME).hack ../00_HACK/ROM.hack cp $(NAME).hack ../00_HACK/ROM.hack
clean: clean:

10
07_Operating_System/01_GPIO_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = /bin/python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/02_UART_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/03_Sys_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/04_Memory_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/05_Array_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/06_Math_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/07_String_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/08_StdIO_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/09_Screen_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/10_Output_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/11_Touch_Test/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

10
07_Operating_System/12_Tetris/Makefile
View File

@ -1,13 +1,15 @@
PYTHON = python3.11
all: jack vm asm bin sim all: jack vm asm bin sim
jack: jack:
../../tools/JackCompiler/JackCompiler.pyc ./ $(PYTHON) ../../tools/JackCompiler/JackCompiler.pyc ./
vm: vm:
../../tools/VMTranslator/VMTranslator.pyc ./ $(PYTHON) ../../tools/VMTranslator/VMTranslator.pyc ./
asm: asm:
../../tools/Assembler/assembler.pyc out.asm $(PYTHON) ../../tools/Assembler/assembler.pyc out.asm
bin: bin:
../../tools/AsciiToBin.py out.hack $(PYTHON) ../../tools/AsciiToBin.py out.hack
sim: sim:
cp out.hack ../00_HACK/ROM.hack cp out.hack ../00_HACK/ROM.hack
upload: upload:

18
Revision.md
View File

@ -1,17 +1,32 @@
# Revision V2.0 # 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 ## update 18.10.2022
### correct typos: ### correct typos:
* `Hack/CPU.v`: Replace `loadM` with `writeM` * `Hack/CPU.v`: Replace `loadM` with `writeM`
* update diagramms * update diagramms
### update tools to python3.10: ### update tools to python3.10:
* `tools/Assembler/assembler.pyc`: update tools to python 3.10 * `tools/Assembler/assembler.pyc`: update tools to python 3.10
* `tools/Jack/JackCompiler.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 * `tools/Jack/VMTranslator.pyc`: update tools to python 3.10
### update Jack-OS: ### update Jack-OS:
* `Jack/UART.jack`: replace `init()` with `init(int addr)` * `Jack/UART.jack`: replace `init()` with `init(int addr)`
### wierd behaviour of iCE40HX8K-EVB: ### wierd behaviour of iCE40HX8K-EVB:
@ -21,10 +36,13 @@
* `Hack/Clock.v`: 25MHz? * `Hack/Clock.v`: 25MHz?
### iceprog: programmer.ino ### iceprog: programmer.ino
* set default to `bridge` (led green on). * set default to `bridge` (led green on).
### consistency: ### consistency:
* `Hack/Reset.v`: * `Hack/Reset.v`:
### boot from spi ### boot from spi
* 04_Hack-FLASH * 04_Hack-FLASH

BIN
tools/Assembler/assembler.pyc
View File

Binary file not shown.

BIN
tools/Assembler/code.pyc
View File

Binary file not shown.

BIN
tools/Assembler/parser.pyc
View File

Binary file not shown.

BIN
tools/Assembler/symbolTable.pyc
View File

Binary file not shown.

BIN
tools/JackCompiler/CompilationEngine.pyc
View File

Binary file not shown.

BIN
tools/JackCompiler/JackAnalyser.pyc
View File

Binary file not shown.

BIN
tools/JackCompiler/JackCompiler.pyc
View File

Binary file not shown.

BIN
tools/JackCompiler/JackTokenizer.pyc
View File

Binary file not shown.

BIN
tools/JackCompiler/SymbolTable.pyc
View File

Binary file not shown.

BIN
tools/JackCompiler/VMCodeWriter.pyc
View File

Binary file not shown.

BIN
tools/VMTranslator/VMTranslator.pyc
View File

Binary file not shown.

BIN
tools/VMTranslator/codeWriter.pyc
View File

Binary file not shown.

BIN
tools/VMTranslator/parser.pyc
View File

Binary file not shown.