Changeset 956 for trunk

Timestamp:

10/17/10 00:00:19 (3 years ago)

Author:

reyalp

Message:

Fix some incorrect inline asm

Location:

trunk/platform

Files:

• a2000/sub/100c/capt_seq.c (modified) (1 diff)
• a2000/sub/100c/stubs_auto.S (modified) (1 diff)
• g11/sub/100j/boot.c (modified) (3 diffs)
• g11/sub/100j/stubs_auto.S (modified) (2 diffs)
• ixus100_sd780/kbd.c (modified) (1 diff)
• ixus100_sd780/sub/100c/capt_seq.c (modified) (7 diffs)
• ixus100_sd780/sub/100c/stubs_auto.S (modified) (1 diff)
• ixus860_sd870/sub/100c/movie_rec.c (modified) (2 diffs)
• ixus860_sd870/sub/100c/stubs_auto.S (modified) (3 diffs)
• ixus860_sd870/sub/100c/touch_wheel.c (modified) (1 diff)

trunk/platform/a2000/sub/100c/capt_seq.c

@@ -22 +22 @@
 "                LDR     R1, =0x539\n"
 "                LDR     R0, =0xFFC4AA98\n"                     // "SsShootTask.c"
-"                BL      =0xFFC0BD98\n"                         // DebugAssert
-"                BL      =0xFFC0BB50\n"                         // eventproc_export_ExitTask ; LOCATION: KerTask.c:0
+"                BL      sub_FFC0BD98\n"                                // DebugAssert
+"                BL      sub_FFC0BB50\n"                                // eventproc_export_ExitTask ; LOCATION: KerTask.c:0
 "                LDMFD   SP!, {R3-R7,PC}\n"
 "loc_FFC4AEB8:\n"

trunk/platform/a2000/sub/100c/stubs_auto.S

@@ -19 +19 @@
 STUB(FFC0B74C)
 STUB(FFC0B8C0)
+STUB(FFC0BB50)
 STUB(FFC0BCD8)
 STUB(FFC0BD98)

trunk/platform/g11/sub/100j/boot.c

@@ -294 +294 @@
                                 "B       loc_FF81F8A8\n"
 "loc_FF81F8AC:\n"
-//                "BL      0xFF833334\n"// removed, see boot() function
+//                "BL      sub_FF833334\n"// removed, see boot() function
                 "BL      sub_FF85FA68\n"
                 "BL              sub_FF838F18\n"
@@ -491 +491 @@
                "LDMEQFD SP!, {R4-R8,LR}\n"
                "LDREQ   R0, =0xFF86F9A8\n"
-                           "BEQ     =0xFF81175C\n" //qPrintf
+                           "BEQ     sub_FF81175C\n" //qPrintf
                "LDMFD   SP!, {R4-R8,PC}\n"
  );
@@ -682 +682 @@
                  "LDR     R0, =0xFF86F378\n"
                  
-                                 "BL      =0xFF81E88C\n"
+                                 "BL      sub_FF81E88C\n"
 
 "loc_FF86F340:\n"

trunk/platform/g11/sub/100j/stubs_auto.S

@@ -8 +8 @@
 STUB(FF811178)
 STUB(FF81165C)
+STUB(FF81175C)
 STUB(FF8133E4)
 STUB(FF813BE0)
@@ -33 +34 @@
 STUB(FF833328)
 STUB(FF83332C)
+STUB(FF833334)
 STUB(FF83441C)
 STUB(FF834A3C)

trunk/platform/ixus100_sd780/kbd.c

@@ -205 +205 @@
                 "stmdb sp!, {r0, r1, lr}\n"
                 "mov r0, sp\n"
-                "BL =0xFF922E14\n"  //GetLogToFile
+                "MOV LR, PC\n"
+                "LDR PC, =0xFF922E14\n"  //GetLogToFile
                 "ldmia sp!, {r0, r1, lr}\n"
         );

trunk/platform/ixus100_sd780/sub/100c/capt_seq.c

@@ -685 +685 @@
                         "                MOV     R1, #1\n"
                         "                BL      sub_FF866178\n"
-                        "                BL      =0xFF81B23C\n"         //ExitTask
+                        "                BL      sub_FF81B23C\n"                //ExitTask
                         "                ADD     SP, SP, #0x20\n"
                         "                LDMFD   SP!, {R4-R8,PC}\n"
@@ -738 +738 @@
                         "loc_FF899E10:\n"
                         "                LDR     R0, =0xFF896C24\n"  //aExpdrv_c
-                        "                BL      =0xFF81B284\n"                 //DebugAssert
+                        "                BL      sub_FF81B284\n"                //DebugAssert
                         "                B       loc_FF899DB8\n"
                         "loc_FF899E1C:\n"
@@ -1186 +1186 @@
                         "                LDRNE   R1, =0x583\n"
                         "                LDRNE   R0, =0xFF896C24\n" //aExpdrv_c
-                        "                BLNE    =0xFF81B284\n"  //DebugAssert
+                        "                BLNE    sub_FF81B284\n"  //DebugAssert
                         "loc_FF897740:\n"
                         "                CMP     R5, #1\n"
@@ -1198 +1198 @@
                         "                LDRNE   R0, =0xFF896C24\n" //aExpdrv_c
                         "                LDMNEFD SP!, {R4-R8,LR}\n"
-                        "                BNE     =0xFF81B284\n"  //DebugAssert
+                        "                BNE     sub_FF81B284\n"  //DebugAssert
                         "                LDMFD   SP!, {R4-R8,PC}\n"
 );
@@ -1216 +1216 @@
                         "                MOVNE   R1, #0x140\n"
                         "                LDRNE   R0, =0xFF888D10\n"  //aShutter_c
-                        "                BLNE    =0xFF81B284\n"  //DebugAssert
+                        "                BLNE    sub_FF81B284\n"  //DebugAssert
                         "                CMN     R4, #0xC00\n"
                         "                LDREQSH R4, [R5,#2]\n"
@@ -1223 +1223 @@
                         "                LDREQ   R0, =0xFF888D10\n"  //aShutter_c
                         "                STRH    R4, [R5,#2]\n"
-                        "                BLEQ    =0xFF81B284\n"  //DebugAssert
+                        "                BLEQ    sub_FF81B284\n"  //DebugAssert
                         "                MOV     R0, R4\n"
 //                      "                BL      sub_FF9A010C\n" //--
                         "                                BL      apex2us\n" // ++
                         "                MOV     R4, R0\n"
-//                      "                BL      0xFF8AEED4\n"  //nullsub_59
+//                      "                BL      sub_FF8AEED4\n"  //nullsub_59
                         "                MOV     R0, R4\n"
                         "                BL      sub_FF8B2850\n"
@@ -1236 +1236 @@
                         "                LDMNEFD SP!, {R4-R6,LR}\n"
                         "                LDRNE   R0, =0xFF888D10\n"  //aShutter_c
-                        "                BNE     =0xFF81B284\n"  //DebugAssert
+                        "                BNE     sub_FF81B284\n"  //DebugAssert
                         "                LDMFD   SP!, {R4-R6,PC}\n"
 );

trunk/platform/ixus100_sd780/sub/100c/stubs_auto.S

@@ -186 +186 @@
 STUB(FF89B298)
 STUB(FF89B330)
+STUB(FF8AEED4)
 STUB(FF8AF4F8)
 STUB(FF8B11AC)

trunk/platform/ixus860_sd870/sub/100c/movie_rec.c

@@ -1589 +1589 @@
         "     MOV     R0, R6\n"
         "     BL         sub_FF859588\n"
-        "     BL         =0xFF980908\n"    // StartRecModeMenu
+        "     BL         sub_FF980908\n"    // StartRecModeMenu
         "     B         loc_FF877FF4\n"
 
@@ -3147 +3147 @@
         "     MOV     R1, #0\n"
         "     MOV     R0, #0\n"
-        "     BL         =0xFF82CDC8\n"    // sub_FF82CDC8
+        "     BL         sub_FF82CDC8\n"    // sub_FF82CDC8
         "     LDR     R0, [R4,#8]\n"
         "     BL         sub_FF86A26C\n"

trunk/platform/ixus860_sd870/sub/100c/stubs_auto.S

@@ -96 +96 @@
 STUB(FF82CAF8)
 STUB(FF82CD9C)
+STUB(FF82CDC8)
 STUB(FF82CDE8)
 STUB(FF82CE18)
@@ -168 +169 @@
 STUB(FF866318)
 STUB(FF867708)
+STUB(FF868080)
 STUB(FF8684DC)
 STUB(FF86910C)
@@ -450 +452 @@
 STUB(FF9563E4)
 STUB(FF956D3C)
+STUB(FF980908)
 STUB(FF989F3C)
 STUB(FF989F50)

trunk/platform/ixus860_sd870/sub/100c/touch_wheel.c

@@ -242 +242 @@
         "     MOV     R0, #2\n"
         "     BL         _taskcreate_WdtReset\n"
-        "     BL         =0xFF868080\n"    // StartWDT
+        "     BL         sub_FF868080\n"    // StartWDT
         "     BL         _EventProcedure\n"
         "     BL         sub_FF86376C\n"