Version RO_3_70 taken

kernel/s/k_body

@@ -775,15 +775,16 @@ Aborted Keep
         STMFD   r13!, {r14}         ; remember the abort pc
         BL      |_kernel_copyerror|
         ADD     r14, r12, #O_registerDump
-  [ SAnaffsilicon
-    NOP
-    NOP
-  ]
+
+  [ SASTMhatbroken
+	STMIB	r14!, {r1-r12}
+	STMIB	r14, {r13,r14}^
+	NOP
+	SUB	r14, r14, #12*4
+  |
         STMIB   r14, {r1-r14}^
-  [ SAnaffsilicon
-    NOP
-    NOP
   ]
+
         LDMFD   r13!, {r1, r2, r3}
         TST     r1, #3
         LDRNE   r1, [r14, #lr * 4]
@@ -1367,11 +1368,16 @@ ErrorHandler Keep
 ; we switch back to SWI mode to save the registers.
         SWI     EnterSVC
         ADD     r14, r0, #O_registerDump
-  [ SAnaffsilicon
-    NOP
-    NOP
-  ]
+
+  [ SASTMhatbroken
+	STMIA	r14!, {r0-r12}
+	STMIA	r14, {r13,r14}^
+	NOP
+	SUB	r14, r14, #13*4
+  |
         STMIA   r14, {r0-r14}^
+  ]
+
         MOV     r12, r0
         ADD     r0, r0, #O_errorNumber
         LDMDA   r0, {r1, r2}            ; r1 is error pc, r2 error number
@@ -1403,10 +1409,7 @@ EventHandler Keep
         STR     r0, [r12, #O_eventCode]
         ADD     r11, r12, #O_eventRegisters
         STMIA   r11, {r0-r10, r13}
-  [ SAnaffsilicon
-    NOP
-    NOP
-  ]
+
         STMDB   r11, {r13}^
         MOV     v6, r12
         MOV     v2, r11
@@ -1626,9 +1629,6 @@ ReloadUserState
         NOOP
         ADD     r14, r0, #pc*4
         LDMDB   r14, {r0-r14}^
-  [ SAnaffsilicon
-    NOP
-  ]
         NOOP
         LDMIA   r14, {pc}^
 
@@ -3033,9 +3033,6 @@ dividebyzero
         SWI     EnterSVC
         LDR     r14, [ip, #pc * 4]
         LDMIB   ip, {r1-r14}^
-  [ SAnaffsilicon
-    NOP
-  ]
         NOOP
         STMDB   sp!, {r10, r11, r12}
         STMDB   sp!, {r14}

s/h_StrongA

@@ -14,10 +14,10 @@
 ;
 
         GBLL    StrongARM
-StrongARM SETL {TRUE}
+	GBLL	SASTMhatbroken
 
-        GBLL    SAnaffsilicon
-SAnaffsilicon  SETL {TRUE} :LAND: StrongARM
+StrongARM	SETL {TRUE}
+SASTMhatbroken	SETL {TRUE} :LAND: StrongARM
 
 XOS_SynchroniseCodeAreas * &2006e
 XOS_CallASWIR12          * &20071

s/version

@@ -12,5 +12,5 @@
 ; See the License for the specific language governing permissions and
 ; limitations under the License.
 ;
-        DCB     "4.84 (04 Jul 1996)"
+        DCB     "4.85 (19 Dec 1996)"
         END