From f4f2ed0cfc306e9079ccf9afe820c1f43d591f20 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b871894f-2f95-9b40-918c-086798483c85>
Date: Thu, 25 Dec 2008 11:06:58 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@143 b871894f-2f95-9b40-918c-086798483c85
---
 trunk/bootrom/build/libraries/init/ARM11/crt0.c  | 12 ++++++------
 trunk/bootrom/build/libraries/init/ARM9/crt0.c   | 12 ++++++------
 .../build/libraries/init/common/crt0_excp.c      | 16 ++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/trunk/bootrom/build/libraries/init/ARM11/crt0.c b/trunk/bootrom/build/libraries/init/ARM11/crt0.c
index 6d3cf60..ac4170a 100644
--- a/trunk/bootrom/build/libraries/init/ARM11/crt0.c
+++ b/trunk/bootrom/build/libraries/init/ARM11/crt0.c
@@ -37,15 +37,15 @@ asm void _start( void )
         INASM_EXTERN( i_stupIrqVeneer )
         INASM_EXTERN( i_stupFiqVeneer )
         INASM_EXTERN( i_stupSwiVeneer )
-        INASM_EXTERN( i_stupUndefInstVeneer )
-        INASM_EXTERN( i_stupPrefetchAbortVeneer )
-        INASM_EXTERN( i_stupDataAbortVeneer )
+        INASM_EXTERN( i_stupUndefVeneer )
+        INASM_EXTERN( i_stupIAbtVeneer )
+        INASM_EXTERN( i_stupDAbtVeneer )
 
         b       stupStartHandlerVeneer  // don't change for NULL access compatibility
-undef   b       i_stupUndefInstVeneer
+undef   b       i_stupUndefVeneer
 swi     b       i_stupSwiVeneer
-iabt    b       i_stupPrefetchAbortVeneer
-dabt    b       i_stupDataAbortVeneer
+iabt    b       i_stupIAbtVeneer
+dabt    b       i_stupDAbtVeneer
 reserve b       reserve
 irq     b       i_stupIrqVeneer
 fiq     b       i_stupFiqVeneer
diff --git a/trunk/bootrom/build/libraries/init/ARM9/crt0.c b/trunk/bootrom/build/libraries/init/ARM9/crt0.c
index 0f44dee..cf22bd3 100644
--- a/trunk/bootrom/build/libraries/init/ARM9/crt0.c
+++ b/trunk/bootrom/build/libraries/init/ARM9/crt0.c
@@ -37,15 +37,15 @@ asm void _start( void )
         INASM_EXTERN( i_stupIrqVeneer )
         INASM_EXTERN( i_stupFiqVeneer )
         INASM_EXTERN( i_stupSwiVeneer )
-        INASM_EXTERN( i_stupUndefInstVeneer )
-        INASM_EXTERN( i_stupPrefetchAbortVeneer )
-        INASM_EXTERN( i_stupDataAbortVeneer )
+        INASM_EXTERN( i_stupUndefVeneer )
+        INASM_EXTERN( i_stupIAbtVeneer )
+        INASM_EXTERN( i_stupDAbtVeneer )
 
         b       stupStartHandlerVeneer  // don't change for NULL access compatibility
-undef   b       i_stupUndefInstVeneer
+undef   b       i_stupUndefVeneer
 swi     b       i_stupSwiVeneer
-iabt    b       i_stupPrefetchAbortVeneer
-dabt    b       i_stupDataAbortVeneer
+iabt    b       i_stupIAbtVeneer
+dabt    b       i_stupDAbtVeneer
 reserve b       reserve
 irq     b       i_stupIrqVeneer
 fiq     b       i_stupFiqVeneer
diff --git a/trunk/bootrom/build/libraries/init/common/crt0_excp.c b/trunk/bootrom/build/libraries/init/common/crt0_excp.c
index 4f36f61..a26e2cd 100644
--- a/trunk/bootrom/build/libraries/init/common/crt0_excp.c
+++ b/trunk/bootrom/build/libraries/init/common/crt0_excp.c
@@ -44,9 +44,9 @@ LSYM(0)
 i_stupExcpVennerCode
         DCD     i_stupExcpTerminateCode  // IRQ
         DCD     i_stupExcpTerminateCode  // FIQ
-        DCD     i_stupSwiVeneerCode      // SWI
+        DCD     i_stupSwiVeneerCode      // SWI    osInit前にprint文を出したい可能性があるためここで設定
         DCD     i_stupExcpTerminateCode  // UNDEF
-        DCD     i_stupIAbtTerminateCode  // IABT
+        DCD     i_stupIAbtTerminateCode  // IABT   命令アボートとデータアボートを区別するため別関数に
         DCD     i_stupExcpTerminateCode  // DABT
 
         LTORG
@@ -146,7 +146,7 @@ ASM void i_stupSwiVeneer( void )
 }
 
 /*---------------------------------------------------------------------------*
-  Name:         i_stupUndefInstVeneer
+  Name:         i_stupUndefVeneer
 
   Description:  Undefine Instruction veneer
 
@@ -154,7 +154,7 @@ ASM void i_stupSwiVeneer( void )
 
   Returns:      None.
  *---------------------------------------------------------------------------*/
-ASM void i_stupUndefInstVeneer( void )
+ASM void i_stupUndefVeneer( void )
 {
         ldr     pc, =HW_UDEF_VENEER_BUF
 
@@ -162,7 +162,7 @@ ASM void i_stupUndefInstVeneer( void )
 }
 
 /*---------------------------------------------------------------------------*
-  Name:         i_stupPrefetchAbortVeneer
+  Name:         i_stupIAbtVeneer
 
   Description:  Prefetch Abort veneer
 
@@ -170,7 +170,7 @@ ASM void i_stupUndefInstVeneer( void )
 
   Returns:      None.
  *---------------------------------------------------------------------------*/
-ASM void i_stupPrefetchAbortVeneer( void )
+ASM void i_stupIAbtVeneer( void )
 {
         ldr     pc, =HW_IABT_VENEER_BUF
 
@@ -178,7 +178,7 @@ ASM void i_stupPrefetchAbortVeneer( void )
 }
 
 /*---------------------------------------------------------------------------*
-  Name:         i_stupDataAbortVeneer
+  Name:         i_stupDAbtVeneer
 
   Description:  Data Abort veneer
 
@@ -186,7 +186,7 @@ ASM void i_stupPrefetchAbortVeneer( void )
 
   Returns:      None.
  *---------------------------------------------------------------------------*/
-ASM void i_stupDataAbortVeneer( void )
+ASM void i_stupDAbtVeneer( void )
 {
         ldr     pc, =HW_DABT_VENEER_BUF