diff options
| -rw-r--r-- | asm/NW4R/ut_TagProcessorBase.s | 32 | ||||
| -rw-r--r-- | asm/text_10_3.s | 12 | ||||
| -rw-r--r-- | tools/postprocess/postprocess.py | 12 |
3 files changed, 28 insertions, 28 deletions
diff --git a/asm/NW4R/ut_TagProcessorBase.s b/asm/NW4R/ut_TagProcessorBase.s index d1faeaa..5710aee 100644 --- a/asm/NW4R/ut_TagProcessorBase.s +++ b/asm/NW4R/ut_TagProcessorBase.s @@ -2,15 +2,15 @@ .section .text, "ax" # 0x80006980 - 0x803E1E60
-.global __ct__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFv
-__ct__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFv:
+.global __ct__Q34nw4r2ut19TagProcessorBase$0c$1Fv
+__ct__Q34nw4r2ut19TagProcessorBase$0c$1Fv:
/* 80362E28 0035EA88 3C 80 80 45 */ lis r4, lbl_8044C6DC@ha
/* 80362E2C 0035EA8C 38 84 C6 DC */ addi r4, r4, lbl_8044C6DC@l
/* 80362E30 0035EA90 90 83 00 00 */ stw r4, 0(r3)
/* 80362E34 0035EA94 4E 80 00 20 */ blr
-.global __dt__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFv
-__dt__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFv:
+.global __dt__Q34nw4r2ut19TagProcessorBase$0c$1Fv
+__dt__Q34nw4r2ut19TagProcessorBase$0c$1Fv:
/* 80362E38 0035EA98 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80362E3C 0035EA9C 7C 08 02 A6 */ mflr r0
/* 80362E40 0035EAA0 2C 03 00 00 */ cmpwi r3, 0
@@ -29,8 +29,8 @@ lbl_80362E60: /* 80362E70 0035EAD0 38 21 00 10 */ addi r1, r1, 0x10
/* 80362E74 0035EAD4 4E 80 00 20 */ blr
-.global Process__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFUsPQ34nw4r2ut15PrintContext____esc_ltc____esc_gt
-Process__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFUsPQ34nw4r2ut15PrintContext____esc_ltc____esc_gt:
+.global Process__Q34nw4r2ut19TagProcessorBase$0c$1FUsPQ34nw4r2ut15PrintContext$0c$1
+Process__Q34nw4r2ut19TagProcessorBase$0c$1FUsPQ34nw4r2ut15PrintContext$0c$1:
/* 80362E78 0035EAD8 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 80362E7C 0035EADC 7C 08 02 A6 */ mflr r0
/* 80362E80 0035EAE0 90 01 00 54 */ stw r0, 0x54(r1)
@@ -115,8 +115,8 @@ lbl_80362F7C: /* 80362FA0 0035EC00 38 21 00 50 */ addi r1, r1, 0x50
/* 80362FA4 0035EC04 4E 80 00 20 */ blr
-.global CalcRect__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext____esc_ltc____esc_gt
-CalcRect__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext____esc_ltc____esc_gt:
+.global CalcRect__Q34nw4r2ut19TagProcessorBase$0c$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$0c$1
+CalcRect__Q34nw4r2ut19TagProcessorBase$0c$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$0c$1:
/* 80362FA8 0035EC08 94 21 FF A0 */ stwu r1, -0x60(r1)
/* 80362FAC 0035EC0C 7C 08 02 A6 */ mflr r0
/* 80362FB0 0035EC10 90 01 00 64 */ stw r0, 0x64(r1)
@@ -247,15 +247,15 @@ lbl_80363168: /* 80363188 0035EDE8 38 21 00 60 */ addi r1, r1, 0x60
/* 8036318C 0035EDEC 4E 80 00 20 */ blr
-.global __ct__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFv
-__ct__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFv:
+.global __ct__Q34nw4r2ut19TagProcessorBase$0w$1Fv
+__ct__Q34nw4r2ut19TagProcessorBase$0w$1Fv:
/* 80363190 0035EDF0 3C 80 80 45 */ lis r4, lbl_8044C6C8@ha
/* 80363194 0035EDF4 38 84 C6 C8 */ addi r4, r4, lbl_8044C6C8@l
/* 80363198 0035EDF8 90 83 00 00 */ stw r4, 0(r3)
/* 8036319C 0035EDFC 4E 80 00 20 */ blr
-.global __dt__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFv
-__dt__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFv:
+.global __dt__Q34nw4r2ut19TagProcessorBase$0w$1Fv
+__dt__Q34nw4r2ut19TagProcessorBase$0w$1Fv:
/* 803631A0 0035EE00 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 803631A4 0035EE04 7C 08 02 A6 */ mflr r0
/* 803631A8 0035EE08 2C 03 00 00 */ cmpwi r3, 0
@@ -274,8 +274,8 @@ lbl_803631C8: /* 803631D8 0035EE38 38 21 00 10 */ addi r1, r1, 0x10
/* 803631DC 0035EE3C 4E 80 00 20 */ blr
-.global Process__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFUsPQ34nw4r2ut15PrintContext____esc_ltw____esc_gt
-Process__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFUsPQ34nw4r2ut15PrintContext____esc_ltw____esc_gt:
+.global Process__Q34nw4r2ut19TagProcessorBase$0w$1FUsPQ34nw4r2ut15PrintContext$0w$1
+Process__Q34nw4r2ut19TagProcessorBase$0w$1FUsPQ34nw4r2ut15PrintContext$0w$1:
/* 803631E0 0035EE40 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 803631E4 0035EE44 7C 08 02 A6 */ mflr r0
/* 803631E8 0035EE48 90 01 00 54 */ stw r0, 0x54(r1)
@@ -360,8 +360,8 @@ lbl_803632E4: /* 80363308 0035EF68 38 21 00 50 */ addi r1, r1, 0x50
/* 8036330C 0035EF6C 4E 80 00 20 */ blr
-.global CalcRect__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext____esc_ltw____esc_gt
-CalcRect__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext____esc_ltw____esc_gt:
+.global CalcRect__Q34nw4r2ut19TagProcessorBase$0w$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$0w$1
+CalcRect__Q34nw4r2ut19TagProcessorBase$0w$1FPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext$0w$1:
/* 80363310 0035EF70 94 21 FF A0 */ stwu r1, -0x60(r1)
/* 80363314 0035EF74 7C 08 02 A6 */ mflr r0
/* 80363318 0035EF78 90 01 00 64 */ stw r0, 0x64(r1)
diff --git a/asm/text_10_3.s b/asm/text_10_3.s index 5a07640..dcb04cb 100644 --- a/asm/text_10_3.s +++ b/asm/text_10_3.s @@ -5104,10 +5104,10 @@ lbl_80367EFC: /* 80367F38 00363B98 7C 00 07 75 */ extsb. r0, r0
/* 80367F3C 00363B9C 40 82 00 2C */ bne lbl_80367F68
/* 80367F40 00363BA0 38 6D B1 C8 */ addi r3, r13, lbl_80640488-_SDA_BASE_
-/* 80367F44 00363BA4 4B FF AE E5 */ bl __ct__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFv
-/* 80367F48 00363BA8 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFv@ha
+/* 80367F44 00363BA4 4B FF AE E5 */ bl __ct__Q34nw4r2ut19TagProcessorBase$0c$1Fv
+/* 80367F48 00363BA8 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut19TagProcessorBase$0c$1Fv@ha
/* 80367F4C 00363BAC 3C A0 80 62 */ lis r5, lbl_80621728@ha
-/* 80367F50 00363BB0 38 84 2E 38 */ addi r4, r4, __dt__Q34nw4r2ut19TagProcessorBase____esc_ltc____esc_gtFv@l
+/* 80367F50 00363BB0 38 84 2E 38 */ addi r4, r4, __dt__Q34nw4r2ut19TagProcessorBase$0c$1Fv@l
/* 80367F54 00363BB4 38 6D B1 C8 */ addi r3, r13, lbl_80640488-_SDA_BASE_
/* 80367F58 00363BB8 38 A5 17 28 */ addi r5, r5, lbl_80621728@l
/* 80367F5C 00363BBC 4B E5 EC ED */ bl __register_global_object_tmp
@@ -5118,10 +5118,10 @@ lbl_80367F68: /* 80367F6C 00363BCC 7C 00 07 75 */ extsb. r0, r0
/* 80367F70 00363BD0 40 82 00 2C */ bne lbl_80367F9C
/* 80367F74 00363BD4 38 6D B1 CC */ addi r3, r13, lbl_8064048C-_SDA_BASE_
-/* 80367F78 00363BD8 4B FF B2 19 */ bl __ct__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFv
-/* 80367F7C 00363BDC 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFv@ha
+/* 80367F78 00363BD8 4B FF B2 19 */ bl __ct__Q34nw4r2ut19TagProcessorBase$0w$1Fv
+/* 80367F7C 00363BDC 3C 80 80 36 */ lis r4, __dt__Q34nw4r2ut19TagProcessorBase$0w$1Fv@ha
/* 80367F80 00363BE0 3C A0 80 62 */ lis r5, lbl_80621734@ha
-/* 80367F84 00363BE4 38 84 31 A0 */ addi r4, r4, __dt__Q34nw4r2ut19TagProcessorBase____esc_ltw____esc_gtFv@l
+/* 80367F84 00363BE4 38 84 31 A0 */ addi r4, r4, __dt__Q34nw4r2ut19TagProcessorBase$0w$1Fv@l
/* 80367F88 00363BE8 38 6D B1 CC */ addi r3, r13, lbl_8064048C-_SDA_BASE_
/* 80367F8C 00363BEC 38 A5 17 34 */ addi r5, r5, lbl_80621734@l
/* 80367F90 00363BF0 4B E5 EC B9 */ bl __register_global_object_tmp
diff --git a/tools/postprocess/postprocess.py b/tools/postprocess/postprocess.py index ab2d912..c45ec16 100644 --- a/tools/postprocess/postprocess.py +++ b/tools/postprocess/postprocess.py @@ -34,12 +34,12 @@ import struct # Substitutions substitutions = ( - ('<', '____esc_lt'), - ('>', '____esc_gt'), - ('@', '____esc_at'), - ('\\', '____esc_bs'), - (',', '____esc_cm'), - ('-', '____esc_hy') + ('<', '$0'), + ('>', '$1'), + ('@', '$2'), + ('\\', '$3'), + (',', '$4'), + ('-', '$5') ) def format(symbol): |