Commit 853895bc authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Fix to unixlib.s.asm

Detail:
  Return address was being pulled from the wrong stack!
Admin:
  Tested.

Version 5.34. Tagged as 'TCPIPLibs-5_34'
parent 5d11f28d
/* (5.33)
/* (5.34)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.33
#define Module_MajorVersion_CMHG 5.34
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 30 Nov 1999
#define Module_Date_CMHG 02 Dec 1999
#define Module_MajorVersion "5.33"
#define Module_Version 533
#define Module_MajorVersion "5.34"
#define Module_Version 534
#define Module_MinorVersion ""
#define Module_Date "30 Nov 1999"
#define Module_Date "02 Dec 1999"
#define Module_FullVersion "5.33"
#define Module_FullVersion "5.34"
......@@ -21,7 +21,7 @@
AREA |Asm$$Code|, CODE, READONLY
_get_t0_count
FunctionEntry "r4"
MOV ip, lr
[ {CONFIG}<>26
MRS r2, CPSR
]
......@@ -32,18 +32,18 @@ _get_t0_count
[ {CONFIG}=26
TEQP pc,#I_bit :OR: SVC_mode
|
MRS r4, CPSR
ORR r4, r4, #I32_bit
MSR CPSR_c, r4 ; Disable interrupts
MRS r0, CPSR
ORR r0, r0, #I32_bit
MSR CPSR_c, r0 ; Disable interrupts
]
STRB r3,[r3,#Timer0LR]
LDRB r1,[r3,#Timer0CL]
LDRB r0,[r3,#Timer0CH]
ORR r0,r1,r0,LSL #8
[ {CONFIG}<>26
MSR CPSR_cf, r2 ; Restore entry mode and irq state
MSR CPSR_c, r2 ; Restore entry mode and irq state
]
Return "v1"
Return ,LinkNotStacked,,ip
END
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment