uxn

commit 296d4c5070f0c2a81739800743bf269205999ce3
parent e02a0e440f67f3e6a2247ed40878f620e4d66e9d
Author: neauoire <aliceffekt@gmail.com>
Date:   Sun, 28 Mar 2021 12:20:54 -0700

Removed offset from assembly export size

Diffstat:
M
README.md
 | 
7
++++---
M
projects/examples/dev.keys.usm
 | 
7
++-----
M
src/assembler.c
 | 
2
+-

3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
@@ -29,12 +29,13 @@ Read more in the [Uxambly Guide](https://wiki.xxiivv.com/site/uxambly.html).
 ( devices )
 
 |0100 ;Console { pad 8 char 1 byte 1 short 2 }
-|01F0 .RESET .FRAME .ERROR ( vectors )
-|01F8 [ 13fd 1ef3 1bf2 ] ( palette )
+|0200 ,RESET JMP2
+|0204 ,ERROR JMP2
+|0208 ,FRAME JMP2
 
 ( program )
 
-|0200 @RESET 
+@RESET 
 	
 	,text1 ,print-label JSR2
 	,text2 ,print-label JSR2
diff --git a/projects/examples/dev.keys.usm b/projects/examples/dev.keys.usm
@@ -33,9 +33,6 @@ BRK
 	,cursor_icn =Sprite.addr
 	~cursor.blink MOD2 #00 EQU =cursor.blink
 
-	
-
-
 	~Keys #00 EQU ^$end JNZ
 
 	( enter key )
@@ -93,6 +90,6 @@ BRK
 	0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
 ]
 
-;text { body 512 }
-
 @ERROR BRK 
+
+;text { body 2 }
diff --git a/src/assembler.c b/src/assembler.c
@@ -439,7 +439,7 @@ void
 cleanup(char *filename)
 {
 	int i;
-	printf("Assembled %s(%0.2fkb), %d labels, %d macros.\n\n", filename, p.ptr / 1000.0, p.llen, p.mlen);
+	printf("Assembled %s(%0.2fkb), %d labels, %d macros.\n\n", filename, (p.ptr - OFFSET) / 1000.0, p.llen, p.mlen);
 	for(i = 0; i < p.llen; ++i)
 		if(!p.labels[i].refs)
 			printf("--- Unused label: %s\n", p.labels[i].name);