From 1ff4d0af4878c8c6fa5296ecdc0d26239ee1ea02 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Sun, 18 Sep 2016 14:53:18 +0000
Subject: Prepping thumb2fileIO3.s for Thumb-2

---
 thumb2fileIO3.s | 102 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 70 insertions(+), 32 deletions(-)

diff --git a/thumb2fileIO3.s b/thumb2fileIO3.s
index 05c990e..da498ae 100644
--- a/thumb2fileIO3.s
+++ b/thumb2fileIO3.s
@@ -1,5 +1,7 @@
 
+	.syntax	unified
 	.fpu	vfp3
+	.thumb
 
 	.include "armmacros.s"
 
@@ -90,7 +92,8 @@ fwritestring_error:
 
 stdioF:
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	open_stdio
 	mov	sp,r4
 
@@ -104,7 +107,8 @@ stdioF:
 
 stderrF:
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	open_stderr
 	mov	sp,r4
 
@@ -120,14 +124,17 @@ openF:
 	add	r0,r6,#4
 	mov	r1,r4
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	open_file
 	mov	sp,r4
 
 	mov	r3,r0
 	cmp	r0,#0
 	mov	r4,#-1
+	it mi
 	movmi	r2,#0
+	it pl
 	movpl	r2,#1
 	ldr	pc,[sp],#4
 
@@ -138,7 +145,8 @@ openF:
 closeF:
 	mov	r0,r3
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	close_file
 	mov	sp,r4
 	mov	r4,r0
@@ -153,7 +161,8 @@ reopenF:
 	mov	r1,r4
 	mov	r6,r2
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	re_open_file
 	mov	sp,r4
 
@@ -170,7 +179,8 @@ readFC:
 	mov	r0,r3
 	mov	r6,r3
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_char
 	mov	sp,r4
 
@@ -199,7 +209,8 @@ readFI:
 	mov	r6,r3
 	
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_int
 	mov	sp,r4
 
@@ -215,7 +226,8 @@ readFI:
 
 readFR:
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	mov	r0,r3
 	sub	sp,sp,#8
 	mov	r6,r3
@@ -247,7 +259,8 @@ readFS_r_gc:
 	add	r2,r10,#8
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_characters
 	mov	sp,r4
 	mov	r3,r8
@@ -289,7 +302,8 @@ readFString:
 	mov	r1,sp
 	
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_characters
 	mov	sp,r4
 	mov	r3,r8
@@ -323,7 +337,8 @@ readLineF_r_gc:
 	mov	r7,r1
 	mov	r8,r3
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_line
 	mov	sp,r4
 	mov	r3,r8
@@ -378,7 +393,8 @@ st_copy_string1:
 	add	r7,r1,r4
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_line
 	mov	sp,r4
 	mov	r3,r8
@@ -413,7 +429,8 @@ writeFC:
 	mov	r0,r2
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_write_char
  	mov	sp,r4
 
@@ -431,7 +448,8 @@ writeFI:
 	mov	r0,r2
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_write_int
  	mov	sp,r4
 
@@ -448,7 +466,8 @@ writeFR:
 	mov	r0,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
  	bl	file_write_real
  	mov	sp,r4
 
@@ -467,7 +486,8 @@ writeFS:
 	mov	r6,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_write_characters
  	mov	sp,r4
 
@@ -495,7 +515,8 @@ writeFString:
 	add	r0,r0,r1
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_write_characters
  	mov	sp,r4
 
@@ -517,7 +538,8 @@ endF:
 	mov	r6,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_end
  	mov	sp,r4
 
@@ -535,7 +557,8 @@ errorF:
 	mov	r6,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_error
  	mov	sp,r4
 
@@ -553,7 +576,8 @@ positionF:
 	mov	r6,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_position
  	mov	sp,r4
 
@@ -573,7 +597,8 @@ seekF:
 	mov	r2,r4
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_seek
  	mov	sp,r4
 
@@ -591,7 +616,8 @@ shareF:
 	mov	r6,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_share
  	mov	sp,r4
 
@@ -609,12 +635,15 @@ openSF:
 	mov	r6,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	open_s_file
  	mov	sp,r4
 
 	cmp	r0,#0
+	it mi
 	movmi	r2,#0
+	it pl
 	movpl	r2,#1
 
 	mov	r3,r6
@@ -632,7 +661,8 @@ readSFC:
 	mov	r0,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_s_char
  	mov	sp,r4
 
@@ -664,7 +694,8 @@ readSFI:
 	mov	r0,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_s_int
  	mov	sp,r4
 
@@ -684,7 +715,8 @@ readSFR:
 	mov	r2,sp
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	mov	r0,r3
 	sub	r1,sp,#8
 	sub	sp,sp,#8
@@ -718,7 +750,8 @@ readSFS_r_gc:
 	mov	r3,sp
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_s_string
 	mov	sp,r4
 	mov	r3,r8
@@ -761,7 +794,8 @@ readLineSF_r_gc:
 	str	r4,[sp,#-4]!
 	mov	r3,sp
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_s_line
 	mov	sp,r4
 	mov	r3,r8
@@ -817,7 +851,8 @@ st_copy_string2:
 	str	r4,[sp,#-4]!
 	mov	r3,sp
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_read_s_line
 	mov	sp,r4
 	mov	r3,r8
@@ -853,7 +888,8 @@ endSF:
 	mov	r0,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_s_end
  	mov	sp,r4
 
@@ -869,7 +905,8 @@ positionSF:
 	mov	r0,r3
 
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_s_position
  	mov	sp,r4
 
@@ -889,7 +926,8 @@ seekSF:
 	mov	r3,sp
 	
 	mov	r4,sp
-	bic	sp,sp,#4
+	bic	r3,r4,#4
+	mov	sp,r3
 	bl	file_s_seek
  	mov	sp,r4
 
-- 
cgit v1.2.3