Skip to content
Snippets Groups Projects
Commit ba23fb55 authored by Hauke Petersen's avatar Hauke Petersen Committed by GitHub
Browse files

Merge pull request #6206 from haukepetersen/fix_arm7_ulong

cpu/arm7_common: s/u_long/unsigned long/
parents 0111946c ad3ed80f
No related branches found
No related tags found
No related merge requests found
...@@ -62,9 +62,9 @@ void DEBUG_Routine(void) ...@@ -62,9 +62,9 @@ void DEBUG_Routine(void)
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
volatile int arm_abortflag = 0; volatile int arm_abortflag = 0;
void abtorigin(const char *vector, u_long *lnk_ptr1) void abtorigin(const char *vector, unsigned long *lnk_ptr1)
{ {
register u_long *lnk_ptr2; register unsigned long *lnk_ptr2;
register unsigned long *sp; register unsigned long *sp;
register unsigned int cpsr, spsr; register unsigned int cpsr, spsr;
...@@ -85,7 +85,7 @@ void abtorigin(const char *vector, u_long *lnk_ptr1) ...@@ -85,7 +85,7 @@ void abtorigin(const char *vector, u_long *lnk_ptr1)
void UNDEF_Routine(void) void UNDEF_Routine(void)
{ {
/* cppcheck-suppress variableScope */ /* cppcheck-suppress variableScope */
register u_long *lnk_ptr; register unsigned long *lnk_ptr;
__asm__ __volatile__("sub %0, lr, #8" : "=r"(lnk_ptr)); // get aborting instruction __asm__ __volatile__("sub %0, lr, #8" : "=r"(lnk_ptr)); // get aborting instruction
if (arm_abortflag == 0) { if (arm_abortflag == 0) {
...@@ -99,7 +99,7 @@ void UNDEF_Routine(void) ...@@ -99,7 +99,7 @@ void UNDEF_Routine(void)
void PABT_Routine(void) void PABT_Routine(void)
{ {
/* cppcheck-suppress variableScope */ /* cppcheck-suppress variableScope */
register u_long *lnk_ptr; register unsigned long *lnk_ptr;
__asm__ __volatile__("sub %0, lr, #8" : "=r"(lnk_ptr)); // get aborting instruction __asm__ __volatile__("sub %0, lr, #8" : "=r"(lnk_ptr)); // get aborting instruction
if (arm_abortflag == 0) { if (arm_abortflag == 0) {
...@@ -113,7 +113,7 @@ void PABT_Routine(void) ...@@ -113,7 +113,7 @@ void PABT_Routine(void)
void DABT_Routine(void) void DABT_Routine(void)
{ {
/* cppcheck-suppress variableScope */ /* cppcheck-suppress variableScope */
register u_long *lnk_ptr; register unsigned long *lnk_ptr;
__asm__ __volatile__("sub %0, lr, #8" : "=r"(lnk_ptr)); // get aborting instruction __asm__ __volatile__("sub %0, lr, #8" : "=r"(lnk_ptr)); // get aborting instruction
if (arm_abortflag == 0) { if (arm_abortflag == 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment