RE: bad instructions in boot-pxa.s

Applied patch to cvs.

I also added you to the bootldr group so you can update it directly.

Jamey

> -----Original Message-----
> From: Philip Blundell [mailto:pb_at_nexus.co.uk]
> Sent: Wednesday, October 02, 2002 2:12 PM
> To: bootldr_at_handhelds.org
> Subject: [Bootldr] bad instructions in boot-pxa.s
>
>
> I needed this patch to make boot-pxa.s assemble.
>
> p.
>
> Index: boot-pxa.s
> ===================================================================
> RCS file: /usr/cvs/bootldr/boot-pxa.s,v
> retrieving revision 1.15
> diff -u -p -r1.15 boot-pxa.s
> --- boot-pxa.s 4 Sep 2002 22:42:04 -0000 1.15
> +++ boot-pxa.s 2 Oct 2002 18:07:56 -0000
> @@ -144,7 +144,7 @@ _bootldr_end:
> HandleUndef:
> /* save all user registers */
> adr r13, AbortStorage
> - stm r13, {r0-r12}
> + stmia r13, {r0-r12}
> mov r12, r14
> bl InitUARTFF
> ldr r0,STR_UNDEF
> @@ -159,14 +159,14 @@ HandleUndef:
>
> mov r14, r12
> /* restore registers */
> - ldm r13, {r0-r12}
> + ldmia r13, {r0-r12}
> /* now loop */
> 1: b 1b
>
> HandleSWI:
> /* save all user registers */
> adr r13, AbortStorage
> - stm r13, {r0-r12}
> + stmia r13, {r0-r12}
> mov r12, r14
> bl InitUARTFF
> ldr r0,STR_SWI
> @@ -181,7 +181,7 @@ HandleSWI:
>
> mov r14, r12
> /* restore registers */
> - ldm r13, {r0-r12}
> + ldmia r13, {r0-r12}
> /* now loop */
> 1: b 1b
>
> @@ -189,7 +189,7 @@ HandlePrefetchAbort:
> /* save all user registers */
> #if 0
> adr r13, AbortStorage
> - stm r13, {r0-r12}
> + stmia r13, {r0-r12}
> mov r12, r14
> bl InitUARTFF
> #endif
> @@ -212,7 +212,7 @@ HandlePrefetchAbort:
>
> mov r14, r12
> /* restore registers */
> - ldm r13, {r0-r12}
> + ldmia r13, {r0-r12}
> #endif
> /* now loop */
> 1: b 1b
> @@ -238,7 +238,7 @@ AbortStorage:
> HandleDataAbort:
> /* save all user registers */
> adr r13, AbortStorage
> - stm r13, {r0-r12}
> + stmia r13, {r0-r12}
> mov r12, r14
> bl InitUARTFF
> ldr r0,STR_DATA_ABORT
> @@ -253,7 +253,7 @@ HandleDataAbort:
>
> mov r14, r12
> /* restore registers */
> - ldm r13, {r0-r12}
> + ldmia r13, {r0-r12}
> /* now loop */
> 1: b 1b
>
> @@ -262,7 +262,7 @@ HandleIRQ:
>
> /* save all user registers */
> adr r13, AbortStorage
> - stm r13, {r0-r12}
> + stmia r13, {r0-r12}
> mov r12, r14
> bl InitUARTFF
> ldr r0,STR_IRQ
> @@ -274,14 +274,14 @@ HandleIRQ:
>
> mov r14, r12
> /* restore registers */
> - ldm r13, {r0-r12}
> + ldmia r13, {r0-r12}
> /* now loop */
> 1: b 1b
>
> HandleFIQ:
> /* save all user registers */
> adr r13, AbortStorage
> - stm r13, {r0-r12}
> + stmia r13, {r0-r12}
> mov r12, r14
> bl InitUARTFF
> ldr r0,STR_FIQ
> @@ -293,14 +293,14 @@ HandleFIQ:
>
> mov r14, r12
> /* restore registers */
> - ldm r13, {r0-r12}
> + ldmia r13, {r0-r12}
> /* now loop */
> 1: b 1b
>
> HandleNotUsed:
> /* save all user registers */
> adr r13, AbortStorage
> - stm r13, {r0-r12}
> + stmia r13, {r0-r12}
> mov r12, r14
> bl InitUARTFF
> ldr r0,STR_NOT_USED
> @@ -312,7 +312,7 @@ HandleNotUsed:
>
> mov r14, r12
> /* restore registers */
> - ldm r13, {r0-r12}
> + ldmia r13, {r0-r12}
> /* now loop */
> 1: b 1b
>
>
>
> _______________________________________________
> Bootldr mailing list
> Bootldr_at_handhelds.org
> http://handhelds.org/mailman/listinfo/bootldr
>
Received on Wed Oct 02 2002 - 18:47:35 EDT