From 6da1f9fa3c82c79f13cad48bdc54d8b4fc92f500 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Tue, 27 Jul 2021 21:31:23 -0400
Subject: [PATCH] re-arrange to avoid relative expression warning

---
 loader.aii | 134 ++++++++++++++++++++++++++---------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/loader.aii b/loader.aii
index dcad4ed..bc27155 100644
--- a/loader.aii
+++ b/loader.aii
@@ -449,73 +449,6 @@ s3	dc.b 'xxSYSTEM:FSTS:'
 	endp
 
 
-read_block proc
-	entry read_block_abs
-	entry vector
-
-	; input
-	; a = hfs block #
-	; will be adjusted for allocation block offset
-	;
-	with dp
-	clc
-	adc data.block_offset
-
-read_block_abs
-
-
-	; todo -- need to save/restore dp and stack
-
-	if __smartport__ then
-	sta sp.block
-	else
-	sta pro.block
-	endif
-
-;
-; need to save/restore the stack.  start.gs.os will call w/ high stack
-;
-	tsc
-	sta _stack
-	lda #$01bf ; should be enough space
-	tcs
-
-	clc
-	php
-	sec
-	xce
-	dc.b $20 ; jsr
-vector	dc.w $ffff
-	if __smartport__ then
-	dc.b sp.ReadBlock
-	dc.w sp
-	endif
-
-	bcs @fail
-	xce
-	plp
-	lda _stack
-	tcs
-	lda #0
-	rts
-
-@fail	
-	clc
-	xce
-	plp
-	tax ; save
-	lda _stack
-	tcs	
-	sec
-	txa
-	and #$ff
-	rts
-
-_stack	ds.w 1
-
-	endp
-
-
 read_file_block proc
 ; a = block #
 
@@ -583,6 +516,73 @@ read_cat_block proc
 
 
 
+read_block proc
+	entry read_block_abs
+	entry vector
+
+	; input
+	; a = hfs block #
+	; will be adjusted for allocation block offset
+	;
+	with dp
+	clc
+	adc data.block_offset
+
+read_block_abs
+
+
+	if __smartport__ then
+	sta sp.blockNumber
+	else
+	sta pro.blockNumber
+	endif
+
+;
+; need to save/restore the stack.  start.gs.os will call w/ high stack
+;
+	tsc
+	sta _stack
+	lda #$01bf ; should be enough space
+	tcs
+
+	clc
+	php
+	sec
+	xce
+	dc.b $20 ; jsr
+vector	dc.w $ffff
+	if __smartport__ then
+	dc.b Command.ReadBlock
+	dc.w sp
+	endif
+
+	bcs @fail
+	xce
+	plp
+	lda _stack
+	tcs
+	lda #0
+	rts
+
+@fail	
+	clc
+	xce
+	plp
+	tax ; save
+	lda _stack
+	tcs	
+	sec
+	txa
+	and #$ff
+	rts
+
+_stack	ds.w 1
+
+	endp
+
+
+
+
 cat_lookup proc
 
 	import name_check, match