Skip to content

Commit 24959fb

Browse files
committed
update
1 parent 823b3f6 commit 24959fb

38 files changed

+519
-531
lines changed

Makefile

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ kernel: $(SOURCE)
4242
@$(AS) --cpu 6502 -tnone src/functions/bank_mng/kernel_free_bank.s -o tmp/kernel_free_bank.o
4343
@$(AS) --cpu 6502 -tnone src/functions/bank_mng/kernel_free_bank_by_pid.s -o tmp/kernel_free_bank_by_pid.o
4444
@$(AR) r tmp/kernel.lib tmp/xminma.o
45-
@$(AR) r tmp/kernel.lib tmp/xminma.o
4645
@$(AR) r tmp/kernel.lib tmp/switch_to_kernel_extended.o
4746
@$(AR) r tmp/kernel.lib tmp/kernel_restore_banking_states.o
4847
@$(AR) r tmp/kernel.lib tmp/xbank_routine.o
@@ -55,13 +54,16 @@ kernel: $(SOURCE)
5554
@$(AR) r tmp/kernel_bank8.lib tmp/xsend.o
5655
@$(AR) r tmp/kernel_bank8.lib tmp/xclose_socket.o
5756

58-
@$(AS) --verbose -s -tnone --debug-info --cpu 6502 -tnone src/kernel8/src/kernel8.s -o tmp/kernel_bank8.ld65 $(ASFLAGS) > output.log
57+
58+
@$(AS) --cpu 6502 -DWITH_SDCARD_FOR_ROOT=1 --verbose -s -ttelestrat src/kernel_main_memory.s -o tmp/kernel_main_memory.ld65
59+
@$(AS) --verbose -s -tnone --debug-info --cpu 6502 -tnone src/kernel8/src/kernel8.s -o tmp/kernel_bank8.ld65 $(ASFLAGS) > output.log
5960
@$(AS) --verbose -s -tnone --debug-info -o kernel_bank0.ld65 -DWITH_SDCARD_FOR_ROOT=1 src/kernel_bank0.s $(ASFLAGS) > output.log
60-
@$(AS) --verbose -s -tnone --debug-info -o kernelsd.ld65 -DWITH_SDCARD_FOR_ROOT=1 $(SOURCE) $(ASFLAGS) > output.log
61+
@$(AS) --verbose -s -tnone --debug-info -o kernelsd.ld65 -DWITH_SDCARD_FOR_ROOT=1 $(SOURCE) $(ASFLAGS) > output.log
6162

6263
@$(AS) --cpu 6502 -DWITH_SDCARD_FOR_ROOT=1 --verbose -s -ttelestrat src/kernel_bank0.s -o tmp/kernel_bank0.ld65 --debug-info > memmap.md
6364
@$(LD) -C cfg/rom.cfg tmp/kernel_bank8.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel_bank8.lib src/kernel8/orixlibs/ksocket/usr/share/ksocket/2025.1/ksocket.lib src/kernel8/orixlibs/ch395/usr/share/ch395/2024.4/ch395.lib -o kernel8.rom -Ln tmp/kernel8sd.sym -m tmp/memmap8.txt -vm
6465

66+
6567
@cp kernel.rom kernelsd.rom
6668
#@sed -re 's/al 00(.{4}) \.(.+)$$/\1 \2/' kernelsd.sym| sort > kernelsd2.sym > output.log
6769
@cp kernelsd.rom $(PATH_PACKAGE_ROM)/
@@ -79,14 +81,17 @@ kernel: $(SOURCE)
7981
@cp kernelus.rom $(PATH_PACKAGE_ROM)/
8082

8183
unittest:
82-
@$(CC) $(CFLAGS) tests/mkdir.c -o tmkdir
83-
@$(CC) $(CFLAGS) tests/fwrite.c -o tfwrite
84-
@$(CC) $(CFLAGS) tests/unit_test/mainarg.s -I dependencies/orix-sdk/macros/ -o 1000 --start-addr 2048
85-
@$(CC) $(CFLAGS) tests/unit_test/mainarg.s -I dependencies/orix-sdk/macros/ -o 1256 --start-addr 2304
84+
@$(CC) $(CFLAGS) tests/mkdir.c -o tmp/tmkdir
85+
@$(CC) $(CFLAGS) tests/fwrite.c -o tmp/tfwrite
86+
@$(CC) $(CFLAGS) tests/unit_test/mainarg.s -I dependencies/orix-sdk/macros/ -o tmp/1000 --start-addr 2048
87+
@$(CC) $(CFLAGS) tests/unit_test/mainarg.s -I dependencies/orix-sdk/macros/ -o tmp/1256 --start-addr 2304
8688

8789
memmap:
88-
@$(AS) --verbose -s -tnone --debug-info -o kernel-telestrat.ld65 -DWITH_SDCARD_FOR_ROOT=1 $(SOURCE) $(ASFLAGS) > memmap.md
89-
@$(LD) -C cfg/kernel.cfg tmp/kernelsd.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel.lib -m kernelus.map -o kernel-telestrat.ld65.rom -DWITH_ACIA=2 -DWITH_SDCARD_FOR_ROOT=1 -Ln kernel-telestrat.ca.sym
90+
@echo "########################################################"
91+
@echo "# Build memmap.md #"
92+
@echo "########################################################"
93+
@$(AS) --cpu 6502 -DMEMMAP_GENERATE=1 --verbose -s -ttelestrat src/kernel_main_memory.s -o tmp/kernel_main_memory.ld65 > memmap.md
94+
#@$(LD) -C cfg/kernel.cfg tmp/kernelsd.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel.lib -m kernelus.map -o kernel-telestrat.ld65.rom -DWITH_ACIA=2 -DWITH_SDCARD_FOR_ROOT=1 -Ln kernel-telestrat.ca.sym
9095
@sh generate_memmap.sh
9196

9297
test:

docs/ADDRESS_READ_BETWEEN_BANK.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
# ADDRESS_READ_BETWEEN_BANK
2-
* XWSTR0

docs/ADIODB_VECTOR.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
# ADIODB_VECTOR
2-
* XWR0
3-
* XWR0
4-
* XRD0
5-
* XRD0

docs/ADSCR.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# ADSCR
2-
* XWR0
3-
* XWR0

docs/ADSCRH.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# ADSCRH
2-
* XWR0
3-
* XWR0

docs/ADSCRL.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# ADSCRL
2-
* XWR0
3-
* XWR0

docs/CURSCR.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# CURSCR
2-
* XWR0
3-
* XWR0

docs/FLGCUR.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# FLGCUR
2-
* XWR0
3-
* XWR0

docs/FLGCUR_STATE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# FLGCUR_STATE
2-
* XWR0
3-
* XWR0

docs/KBDKEY.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# KBDKEY
2-
* XRD0
3-
* XRD0

0 commit comments

Comments
 (0)