Move basic into Rom at B00000 and make 32k available for programs.

mattuna15 · Aug 16, 2020 · bc9b150 · bc9b150
1 parent 136988a
commit bc9b150
Show file tree

Hide file tree

Showing 16 changed files with 11,679 additions and 13,679 deletions.
diff --git a/main_tb_behav.wcfg b/main_tb_behav.wcfg
@@ -14,15 +14,15 @@
       </db_ref>
    </db_ref_list>
    <zoom_setting>
-      <ZoomStartTime time="92657527303fs"></ZoomStartTime>
-      <ZoomEndTime time="135157527304fs"></ZoomEndTime>
-      <Cursor1Time time="132257527303fs"></Cursor1Time>
+      <ZoomStartTime time="0fs"></ZoomStartTime>
+      <ZoomEndTime time="486000000001fs"></ZoomEndTime>
+      <Cursor1Time time="113000000000fs"></Cursor1Time>
    </zoom_setting>
    <column_width_setting>
       <NameColumnWidth column_width="186"></NameColumnWidth>
-      <ValueColumnWidth column_width="81"></ValueColumnWidth>
+      <ValueColumnWidth column_width="77"></ValueColumnWidth>
    </column_width_setting>
-   <WVObjectSize size="19" />
+   <WVObjectSize size="20" />
    <wvobject fp_name="/main_tb/main_inst/computer/cpuAddress" type="array">
       <obj_property name="ElementShortName">cpuAddress[31:0]</obj_property>
       <obj_property name="ObjectShortName">cpuAddress[31:0]</obj_property>
@@ -99,4 +99,8 @@
       <obj_property name="ElementShortName">memAddress[15:0]</obj_property>
       <obj_property name="ObjectShortName">memAddress[15:0]</obj_property>
    </wvobject>
+   <wvobject fp_name="/main_tb/main_inst/computer/io1/txBitCount" type="array">
+      <obj_property name="ElementShortName">txBitCount[3:0]</obj_property>
+      <obj_property name="ObjectShortName">txBitCount[3:0]</obj_property>
+   </wvobject>
 </wave_config>
diff --git a/roms/ehbasic/basic68k.L68 b/roms/ehbasic/basic68k.L68
diff --git a/roms/ehbasic/basic68k.S68 b/roms/ehbasic/basic68k.S68
diff --git a/roms/ehbasic/basic68k.X68 b/roms/ehbasic/basic68k.X68
@@ -68,20 +68,21 @@ nobrk		EQU	0				* null response to INPUT causes a break
 
 	INCLUDE	"basic68k.inc"
 							* RAM offset definitions
-
+prg_strt
 * Use this value to run out of ROM
-*	ORG		$00C000			* past the vectors in a real system
+    ORG $B00000			* past the vectors in a real system
 * Use this value to run out of RAM
-	ORG		$000800			* past the vectors in a real system
+*	ORG		$000800			* past the vectors in a real system
+
 
-* Use these two lines when running from ROM
-*ram_addr	EQU	$02000		* RAM start address
-*ram_size	EQU	$06000		* RAM size
-prg_strt
 
 * Use these two lines when running from RAM
-ram_addr	EQU	$04000		* RAM start address
-ram_size	EQU	$04000		* RAM size
+*ram_addr	EQU	$04000		* RAM start address
+*ram_size	EQU	$04000		* RAM size
+
+* Use these two lines when running from ROM
+ram_addr	EQU	$02000		* RAM start address
+ram_size	EQU	$08000		* RAM size
 
 ACIAC    EQU $F00009
 ACIAD    EQU ACIAC+2
@@ -9157,6 +9158,7 @@ LAB_SMSG
 *************************************************************************************
 
 
+
 *~Font name~Courier New~
 *~Font size~10~
 *~Tab type~1~

diff --git a/roms/ehbasic/basic68k.inc b/roms/ehbasic/basic68k.inc
@@ -1,7 +1,7 @@
 
 * This lot is in RAM
 
-        ORG     0			* start of RAM
+        ORG     100			* start of RAM
 
 ram_strt	ds.l	$100			* allow 1K for the stack, this should be plenty
 						* for any BASIC program that doesn't do something

diff --git a/roms/ehbasic/basic_0.BIN b/roms/ehbasic/basic_0.BIN