Import of InfoZIP

David Marston david at illudium.org.uk
Wed Dec 19 12:53:46 PST 2001


Nick Burrett wrote:

>I have just completed installing Peter's patch.
>
A few lines seem to have ended up being included twice in the import,
or it's my checkout (I tried twice to make sure).  I think there is also
a typo in the return from RegisterUpCall if it fails to allocate the memory.
Patch below:

Index: unixlib/source/module/sul.s
===================================================================
RCS file: /usr/local/cvsroot/gccsdk/unixlib/source/module/Attic/sul.s,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 sul.s
--- unixlib/source/module/sul.s    2001/12/19 16:52:15    1.1.2.1
+++ unixlib/source/module/sul.s    2001/12/19 20:33:48
@@ -98,14 +98,6 @@
 
     MOV     pc, r12           ; Jump to application handler
 
-    MOV     r12, r3
-    LDMEQFD sp!, {r0-r3, pc}^ ; So exit handler
-
-    LDMFD   sp!, {r0-r3, lr}  ; Restore SVC_R14 and registers
-
-    MOV     pc, r12           ; Jump to application handler
-
-
     ; Register an application with the module.
     ;
     ; This SWI registers an application as an intended recipient of UpCalls
@@ -139,7 +131,7 @@
     MOV     r3, #12          
     SWI     XOS_Module         ; Claim memory to use
 
-    LDMVSFD sp!, {r2, r3, lr}  ; Return to caller if error
+    LDMVSFD sp!, {r0, r3, lr}  ; Return to caller if error
     ORRVSS  pc, lr, #VFlag     ; Return error
 
     ; result in R2, return to caller at end





More information about the gcc mailing list