coco2: tweak layout again to make it all fit nicely

EtchedPixels · Jun 30, 2024 · d0ae497 · d0ae497
1 parent 1b098fd
commit d0ae497
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/Kernel/platform/platform-coco2/Makefile b/Kernel/platform/platform-coco2/Makefile
@@ -24,8 +24,7 @@ CROSS_CCOPTS += -I../../dev/
 
 all: $(OBJS)
 
-export CROSS_CC_SEGD=-mcode-section=.text3 -mfar-code-page=2
-export CROSS_CC_SEGI=-mcode-section=.page1 -mfar-code-page=2
+export CROSS_CC_SEGD=-mcode-section=.video -mfar-code-page=2
 
 $(COBJS): %$(BINEXT): %.c
 	$(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEG2) -c $<
@@ -37,7 +36,7 @@ $(CDOBJS): %$(BINEXT): %.c
 	$(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEGDISC) -c $<
 
 tinyide.o: ../../dev/tinyide.c
-	$(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEGI) -c $<
+	$(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEGD) -c $<
 
 tinydisk.o: ../../dev/tinydisk.c
 	$(CROSS_CC) $(CROSS_CCOPTS) $(CROSS_CC_SEGD) -c $<

diff --git a/Kernel/platform/platform-coco2/coco2.s b/Kernel/platform/platform-coco2/coco2.s
@@ -104,7 +104,7 @@ waitvb2:
 _framedet:
 	.word	0
 
-        .area .page1
+        .area .text3
 ; Borrow a tiny bit of page1 to get this low so it can turn the ROM back on
 
 _plt_reboot:

diff --git a/Kernel/platform/platform-coco2/fuzix.link b/Kernel/platform/platform-coco2/fuzix.link
@@ -2,7 +2,7 @@ define basesympat __sectionbase_%s__
 define lensympat __sectionlen_%s__
 section .istack load 0x0000
 section .vectors load 0x0100
-section .page1
+section .text3
 section .start load 0x0400
 section .text
 section .text2
@@ -12,7 +12,6 @@ section .data
 section .videodata
 section .common
 section .commondata
-section .text3
 section .discard load 0xA000
 section .udata load 0xFD00
 entry start
diff --git a/STATUS.md b/STATUS.md
@@ -157,7 +157,7 @@ Builds, needs a 0.5 test run
 
 ## COCO2 (64K, no cartridge)
 
-Fails. Needs 0.5 debug
+Builds, passes basic tests.
 
 ## COCO2Cart (64K with cartridge ROM)