From ba77cf2277650699afd3f778036eb1c1a8c345a6 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 20 Oct 2022 21:49:24 -0700 Subject: [PATCH] Resplit CSimplePool --- asm/Kyoto/CFactoryStore.s | 61 +++++ asm/Kyoto/CObjectReference.s | 381 +++++++++++++++++++++++++++++++ asm/Kyoto/CSimplePool.s | 429 ----------------------------------- configure.py | 2 + ldscript.lcf | 1 - obj_files.mk | 2 + 6 files changed, 446 insertions(+), 430 deletions(-) create mode 100644 asm/Kyoto/CFactoryStore.s create mode 100644 asm/Kyoto/CObjectReference.s diff --git a/asm/Kyoto/CFactoryStore.s b/asm/Kyoto/CFactoryStore.s new file mode 100644 index 00000000..1b7bd3e5 --- /dev/null +++ b/asm/Kyoto/CFactoryStore.s @@ -0,0 +1,61 @@ +.include "macros.inc" + +.section .data +.balign 8 + +.global lbl_803EE3D8 +lbl_803EE3D8: + # ROM: 0x3EB3D8 + .4byte 0 + .4byte 0 + .4byte "__dt__31TObjOwnerParamFv" + +.global lbl_803EE3E4 +lbl_803EE3E4: + # ROM: 0x3EB3E4 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + + +.section .text, "ax" + +.global "__dt__31TObjOwnerParamFv" +"__dt__31TObjOwnerParamFv": +/* 8033FA48 0033C9A8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FA4C 0033C9AC 7C 08 02 A6 */ mflr r0 +/* 8033FA50 0033C9B0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FA54 0033C9B4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FA58 0033C9B8 7C 7F 1B 79 */ or. r31, r3, r3 +/* 8033FA5C 0033C9BC 41 82 00 40 */ beq lbl_8033FA9C +/* 8033FA60 0033C9C0 3C 60 80 3F */ lis r3, lbl_803EE3D8@ha +/* 8033FA64 0033C9C4 38 03 E3 D8 */ addi r0, r3, lbl_803EE3D8@l +/* 8033FA68 0033C9C8 90 1F 00 00 */ stw r0, 0(r31) +/* 8033FA6C 0033C9CC 41 82 00 20 */ beq lbl_8033FA8C +/* 8033FA70 0033C9D0 3C 60 80 3E */ lis r3, lbl_803D9C44@ha +/* 8033FA74 0033C9D4 38 03 9C 44 */ addi r0, r3, lbl_803D9C44@l +/* 8033FA78 0033C9D8 90 1F 00 00 */ stw r0, 0(r31) +/* 8033FA7C 0033C9DC 41 82 00 10 */ beq lbl_8033FA8C +/* 8033FA80 0033C9E0 3C 60 80 3E */ lis r3, __vt__4IObj@ha +/* 8033FA84 0033C9E4 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l +/* 8033FA88 0033C9E8 90 1F 00 00 */ stw r0, 0(r31) +lbl_8033FA8C: +/* 8033FA8C 0033C9EC 7C 80 07 35 */ extsh. r0, r4 +/* 8033FA90 0033C9F0 40 81 00 0C */ ble lbl_8033FA9C +/* 8033FA94 0033C9F4 7F E3 FB 78 */ mr r3, r31 +/* 8033FA98 0033C9F8 4B FD 5E 99 */ bl Free__7CMemoryFPCv +lbl_8033FA9C: +/* 8033FA9C 0033C9FC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FAA0 0033CA00 7F E3 FB 78 */ mr r3, r31 +/* 8033FAA4 0033CA04 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FAA8 0033CA08 7C 08 03 A6 */ mtlr r0 +/* 8033FAAC 0033CA0C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FAB0 0033CA10 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CObjectReference.s b/asm/Kyoto/CObjectReference.s new file mode 100644 index 00000000..dd5da0dd --- /dev/null +++ b/asm/Kyoto/CObjectReference.s @@ -0,0 +1,381 @@ +.include "macros.inc" + +.section .text, "ax" + +.global IsLoading__16CObjectReferenceCFv +IsLoading__16CObjectReferenceCFv: +/* 8033FAB4 0033CA14 88 03 00 03 */ lbz r0, 3(r3) +/* 8033FAB8 0033CA18 38 80 00 00 */ li r4, 0 +/* 8033FABC 0033CA1C 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 +/* 8033FAC0 0033CA20 7C 00 FE 70 */ srawi r0, r0, 0x1f +/* 8033FAC4 0033CA24 7C 00 07 75 */ extsb. r0, r0 +/* 8033FAC8 0033CA28 41 82 00 14 */ beq lbl_8033FADC +/* 8033FACC 0033CA2C 80 03 00 10 */ lwz r0, 0x10(r3) +/* 8033FAD0 0033CA30 28 00 00 00 */ cmplwi r0, 0 +/* 8033FAD4 0033CA34 40 82 00 08 */ bne lbl_8033FADC +/* 8033FAD8 0033CA38 38 80 00 01 */ li r4, 1 +lbl_8033FADC: +/* 8033FADC 0033CA3C 7C 83 23 78 */ mr r3, r4 +/* 8033FAE0 0033CA40 4E 80 00 20 */ blr + +.global Unlock__16CObjectReferenceFv +Unlock__16CObjectReferenceFv: +/* 8033FAE4 0033CA44 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FAE8 0033CA48 7C 08 02 A6 */ mflr r0 +/* 8033FAEC 0033CA4C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FAF0 0033CA50 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FAF4 0033CA54 7C 7F 1B 78 */ mr r31, r3 +/* 8033FAF8 0033CA58 A8 A3 00 02 */ lha r5, 2(r3) +/* 8033FAFC 0033CA5C 54 A0 80 1E */ slwi r0, r5, 0x10 +/* 8033FB00 0033CA60 7C 04 8E 70 */ srawi r4, r0, 0x11 +/* 8033FB04 0033CA64 38 04 FF FF */ addi r0, r4, -1 +/* 8033FB08 0033CA68 50 05 0C 3C */ rlwimi r5, r0, 1, 0x10, 0x1e +/* 8033FB0C 0033CA6C B0 A3 00 02 */ sth r5, 2(r3) +/* 8033FB10 0033CA70 A8 03 00 02 */ lha r0, 2(r3) +/* 8033FB14 0033CA74 54 00 80 1E */ slwi r0, r0, 0x10 +/* 8033FB18 0033CA78 7C 00 8E 70 */ srawi r0, r0, 0x11 +/* 8033FB1C 0033CA7C 7C 00 07 35 */ extsh. r0, r0 +/* 8033FB20 0033CA80 40 82 00 3C */ bne lbl_8033FB5C +/* 8033FB24 0033CA84 80 1F 00 10 */ lwz r0, 0x10(r31) +/* 8033FB28 0033CA88 28 00 00 00 */ cmplwi r0, 0 +/* 8033FB2C 0033CA8C 41 82 00 18 */ beq lbl_8033FB44 +/* 8033FB30 0033CA90 80 1F 00 0C */ lwz r0, 0xc(r31) +/* 8033FB34 0033CA94 28 00 00 00 */ cmplwi r0, 0 +/* 8033FB38 0033CA98 41 82 00 0C */ beq lbl_8033FB44 +/* 8033FB3C 0033CA9C 48 00 01 39 */ bl Unload__16CObjectReferenceFv +/* 8033FB40 0033CAA0 48 00 00 1C */ b lbl_8033FB5C +lbl_8033FB44: +/* 8033FB44 0033CAA4 7F E3 FB 78 */ mr r3, r31 +/* 8033FB48 0033CAA8 4B FF FF 6D */ bl IsLoading__16CObjectReferenceCFv +/* 8033FB4C 0033CAAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8033FB50 0033CAB0 41 82 00 0C */ beq lbl_8033FB5C +/* 8033FB54 0033CAB4 7F E3 FB 78 */ mr r3, r31 +/* 8033FB58 0033CAB8 48 00 00 A5 */ bl CancelLoad__16CObjectReferenceFv +lbl_8033FB5C: +/* 8033FB5C 0033CABC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FB60 0033CAC0 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FB64 0033CAC4 7C 08 03 A6 */ mtlr r0 +/* 8033FB68 0033CAC8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FB6C 0033CACC 4E 80 00 20 */ blr + +.global RemoveReference__16CObjectReferenceFv +RemoveReference__16CObjectReferenceFv: +/* 8033FB70 0033CAD0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FB74 0033CAD4 7C 08 02 A6 */ mflr r0 +/* 8033FB78 0033CAD8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FB7C 0033CADC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FB80 0033CAE0 7C 7F 1B 78 */ mr r31, r3 +/* 8033FB84 0033CAE4 A8 83 00 00 */ lha r4, 0(r3) +/* 8033FB88 0033CAE8 38 04 FF FF */ addi r0, r4, -1 +/* 8033FB8C 0033CAEC B0 03 00 00 */ sth r0, 0(r3) +/* 8033FB90 0033CAF0 A8 03 00 00 */ lha r0, 0(r3) +/* 8033FB94 0033CAF4 2C 00 00 00 */ cmpwi r0, 0 +/* 8033FB98 0033CAF8 40 82 00 4C */ bne lbl_8033FBE4 +/* 8033FB9C 0033CAFC 80 1F 00 10 */ lwz r0, 0x10(r31) +/* 8033FBA0 0033CB00 28 00 00 00 */ cmplwi r0, 0 +/* 8033FBA4 0033CB04 41 82 00 0C */ beq lbl_8033FBB0 +/* 8033FBA8 0033CB08 48 00 00 CD */ bl Unload__16CObjectReferenceFv +/* 8033FBAC 0033CB0C 48 00 00 18 */ b lbl_8033FBC4 +lbl_8033FBB0: +/* 8033FBB0 0033CB10 4B FF FF 05 */ bl IsLoading__16CObjectReferenceCFv +/* 8033FBB4 0033CB14 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8033FBB8 0033CB18 41 82 00 0C */ beq lbl_8033FBC4 +/* 8033FBBC 0033CB1C 7F E3 FB 78 */ mr r3, r31 +/* 8033FBC0 0033CB20 48 00 00 3D */ bl CancelLoad__16CObjectReferenceFv +lbl_8033FBC4: +/* 8033FBC4 0033CB24 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8033FBC8 0033CB28 28 03 00 00 */ cmplwi r3, 0 +/* 8033FBCC 0033CB2C 41 82 00 18 */ beq lbl_8033FBE4 +/* 8033FBD0 0033CB30 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FBD4 0033CB34 38 9F 00 04 */ addi r4, r31, 4 +/* 8033FBD8 0033CB38 81 8C 00 28 */ lwz r12, 0x28(r12) +/* 8033FBDC 0033CB3C 7D 89 03 A6 */ mtctr r12 +/* 8033FBE0 0033CB40 4E 80 04 21 */ bctrl +lbl_8033FBE4: +/* 8033FBE4 0033CB44 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FBE8 0033CB48 A8 7F 00 00 */ lha r3, 0(r31) +/* 8033FBEC 0033CB4C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FBF0 0033CB50 7C 08 03 A6 */ mtlr r0 +/* 8033FBF4 0033CB54 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FBF8 0033CB58 4E 80 00 20 */ blr + +.global CancelLoad__16CObjectReferenceFv +CancelLoad__16CObjectReferenceFv: +/* 8033FBFC 0033CB5C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FC00 0033CB60 7C 08 02 A6 */ mflr r0 +/* 8033FC04 0033CB64 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FC08 0033CB68 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FC0C 0033CB6C 7C 7F 1B 78 */ mr r31, r3 +/* 8033FC10 0033CB70 80 03 00 0C */ lwz r0, 0xc(r3) +/* 8033FC14 0033CB74 28 00 00 00 */ cmplwi r0, 0 +/* 8033FC18 0033CB78 41 82 00 48 */ beq lbl_8033FC60 +/* 8033FC1C 0033CB7C 4B FF FE 99 */ bl IsLoading__16CObjectReferenceCFv +/* 8033FC20 0033CB80 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8033FC24 0033CB84 41 82 00 3C */ beq lbl_8033FC60 +/* 8033FC28 0033CB88 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8033FC2C 0033CB8C 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FC30 0033CB90 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 8033FC34 0033CB94 7D 89 03 A6 */ mtctr r12 +/* 8033FC38 0033CB98 4E 80 04 21 */ bctrl +/* 8033FC3C 0033CB9C 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FC40 0033CBA0 38 9F 00 04 */ addi r4, r31, 4 +/* 8033FC44 0033CBA4 81 8C 00 14 */ lwz r12, 0x14(r12) +/* 8033FC48 0033CBA8 7D 89 03 A6 */ mtctr r12 +/* 8033FC4C 0033CBAC 4E 80 04 21 */ bctrl +/* 8033FC50 0033CBB0 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FC54 0033CBB4 38 60 00 00 */ li r3, 0 +/* 8033FC58 0033CBB8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f +/* 8033FC5C 0033CBBC 98 1F 00 03 */ stb r0, 3(r31) +lbl_8033FC60: +/* 8033FC60 0033CBC0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FC64 0033CBC4 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FC68 0033CBC8 7C 08 03 A6 */ mtlr r0 +/* 8033FC6C 0033CBCC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FC70 0033CBD0 4E 80 00 20 */ blr + +.global Unload__16CObjectReferenceFv +Unload__16CObjectReferenceFv: +/* 8033FC74 0033CBD4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FC78 0033CBD8 7C 08 02 A6 */ mflr r0 +/* 8033FC7C 0033CBDC 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FC80 0033CBE0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FC84 0033CBE4 7C 7F 1B 78 */ mr r31, r3 +/* 8033FC88 0033CBE8 80 63 00 10 */ lwz r3, 0x10(r3) +/* 8033FC8C 0033CBEC 28 03 00 00 */ cmplwi r3, 0 +/* 8033FC90 0033CBF0 41 82 00 18 */ beq lbl_8033FCA8 +/* 8033FC94 0033CBF4 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FC98 0033CBF8 38 80 00 01 */ li r4, 1 +/* 8033FC9C 0033CBFC 81 8C 00 08 */ lwz r12, 8(r12) +/* 8033FCA0 0033CC00 7D 89 03 A6 */ mtctr r12 +/* 8033FCA4 0033CC04 4E 80 04 21 */ bctrl +lbl_8033FCA8: +/* 8033FCA8 0033CC08 38 60 00 00 */ li r3, 0 +/* 8033FCAC 0033CC0C 90 7F 00 10 */ stw r3, 0x10(r31) +/* 8033FCB0 0033CC10 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FCB4 0033CC14 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f +/* 8033FCB8 0033CC18 98 1F 00 03 */ stb r0, 3(r31) +/* 8033FCBC 0033CC1C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FCC0 0033CC20 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FCC4 0033CC24 7C 08 03 A6 */ mtlr r0 +/* 8033FCC8 0033CC28 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FCCC 0033CC2C 4E 80 00 20 */ blr + +.global GetObject__16CObjectReferenceFv +GetObject__16CObjectReferenceFv: +/* 8033FCD0 0033CC30 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8033FCD4 0033CC34 7C 08 02 A6 */ mflr r0 +/* 8033FCD8 0033CC38 90 01 00 24 */ stw r0, 0x24(r1) +/* 8033FCDC 0033CC3C 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8033FCE0 0033CC40 7C 7F 1B 78 */ mr r31, r3 +/* 8033FCE4 0033CC44 80 03 00 10 */ lwz r0, 0x10(r3) +/* 8033FCE8 0033CC48 28 00 00 00 */ cmplwi r0, 0 +/* 8033FCEC 0033CC4C 40 82 00 74 */ bne lbl_8033FD60 +/* 8033FCF0 0033CC50 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8033FCF4 0033CC54 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FCF8 0033CC58 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 8033FCFC 0033CC5C 7D 89 03 A6 */ mtctr r12 +/* 8033FD00 0033CC60 4E 80 04 21 */ bctrl +/* 8033FD04 0033CC64 7C 64 1B 78 */ mr r4, r3 +/* 8033FD08 0033CC68 38 61 00 08 */ addi r3, r1, 8 +/* 8033FD0C 0033CC6C 81 84 00 00 */ lwz r12, 0(r4) +/* 8033FD10 0033CC70 38 BF 00 04 */ addi r5, r31, 4 +/* 8033FD14 0033CC74 38 DF 00 14 */ addi r6, r31, 0x14 +/* 8033FD18 0033CC78 81 8C 00 0C */ lwz r12, 0xc(r12) +/* 8033FD1C 0033CC7C 7D 89 03 A6 */ mtctr r12 +/* 8033FD20 0033CC80 4E 80 04 21 */ bctrl +/* 8033FD24 0033CC84 38 00 00 00 */ li r0, 0 +/* 8033FD28 0033CC88 80 61 00 0C */ lwz r3, 0xc(r1) +/* 8033FD2C 0033CC8C 98 01 00 08 */ stb r0, 8(r1) +/* 8033FD30 0033CC90 90 7F 00 10 */ stw r3, 0x10(r31) +/* 8033FD34 0033CC94 88 01 00 08 */ lbz r0, 8(r1) +/* 8033FD38 0033CC98 28 00 00 00 */ cmplwi r0, 0 +/* 8033FD3C 0033CC9C 41 82 00 24 */ beq lbl_8033FD60 +/* 8033FD40 0033CCA0 80 61 00 0C */ lwz r3, 0xc(r1) +/* 8033FD44 0033CCA4 28 03 00 00 */ cmplwi r3, 0 +/* 8033FD48 0033CCA8 41 82 00 18 */ beq lbl_8033FD60 +/* 8033FD4C 0033CCAC 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FD50 0033CCB0 38 80 00 01 */ li r4, 1 +/* 8033FD54 0033CCB4 81 8C 00 08 */ lwz r12, 8(r12) +/* 8033FD58 0033CCB8 7D 89 03 A6 */ mtctr r12 +/* 8033FD5C 0033CCBC 4E 80 04 21 */ bctrl +lbl_8033FD60: +/* 8033FD60 0033CCC0 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FD64 0033CCC4 38 60 00 00 */ li r3, 0 +/* 8033FD68 0033CCC8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f +/* 8033FD6C 0033CCCC 98 1F 00 03 */ stb r0, 3(r31) +/* 8033FD70 0033CCD0 80 7F 00 10 */ lwz r3, 0x10(r31) +/* 8033FD74 0033CCD4 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8033FD78 0033CCD8 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8033FD7C 0033CCDC 7C 08 03 A6 */ mtlr r0 +/* 8033FD80 0033CCE0 38 21 00 20 */ addi r1, r1, 0x20 +/* 8033FD84 0033CCE4 4E 80 00 20 */ blr + +.global Lock__16CObjectReferenceFv +Lock__16CObjectReferenceFv: +/* 8033FD88 0033CCE8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FD8C 0033CCEC 7C 08 02 A6 */ mflr r0 +/* 8033FD90 0033CCF0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FD94 0033CCF4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FD98 0033CCF8 7C 7F 1B 78 */ mr r31, r3 +/* 8033FD9C 0033CCFC A8 83 00 02 */ lha r4, 2(r3) +/* 8033FDA0 0033CD00 54 80 80 1E */ slwi r0, r4, 0x10 +/* 8033FDA4 0033CD04 7C 03 8E 70 */ srawi r3, r0, 0x11 +/* 8033FDA8 0033CD08 38 03 00 01 */ addi r0, r3, 1 +/* 8033FDAC 0033CD0C 50 04 0C 3C */ rlwimi r4, r0, 1, 0x10, 0x1e +/* 8033FDB0 0033CD10 B0 9F 00 02 */ sth r4, 2(r31) +/* 8033FDB4 0033CD14 80 1F 00 10 */ lwz r0, 0x10(r31) +/* 8033FDB8 0033CD18 28 00 00 00 */ cmplwi r0, 0 +/* 8033FDBC 0033CD1C 40 82 00 58 */ bne lbl_8033FE14 +/* 8033FDC0 0033CD20 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FDC4 0033CD24 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 +/* 8033FDC8 0033CD28 7C 00 FE 70 */ srawi r0, r0, 0x1f +/* 8033FDCC 0033CD2C 7C 00 07 75 */ extsb. r0, r0 +/* 8033FDD0 0033CD30 40 82 00 44 */ bne lbl_8033FE14 +/* 8033FDD4 0033CD34 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8033FDD8 0033CD38 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FDDC 0033CD3C 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 8033FDE0 0033CD40 7D 89 03 A6 */ mtctr r12 +/* 8033FDE4 0033CD44 4E 80 04 21 */ bctrl +/* 8033FDE8 0033CD48 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FDEC 0033CD4C 38 9F 00 04 */ addi r4, r31, 4 +/* 8033FDF0 0033CD50 38 BF 00 14 */ addi r5, r31, 0x14 +/* 8033FDF4 0033CD54 38 DF 00 10 */ addi r6, r31, 0x10 +/* 8033FDF8 0033CD58 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 8033FDFC 0033CD5C 7D 89 03 A6 */ mtctr r12 +/* 8033FE00 0033CD60 4E 80 04 21 */ bctrl +/* 8033FE04 0033CD64 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FE08 0033CD68 38 60 00 01 */ li r3, 1 +/* 8033FE0C 0033CD6C 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f +/* 8033FE10 0033CD70 98 1F 00 03 */ stb r0, 3(r31) +lbl_8033FE14: +/* 8033FE14 0033CD74 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FE18 0033CD78 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FE1C 0033CD7C 7C 08 03 A6 */ mtlr r0 +/* 8033FE20 0033CD80 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FE24 0033CD84 4E 80 00 20 */ blr + +.global __dt__16CObjectReferenceFv +__dt__16CObjectReferenceFv: +/* 8033FE28 0033CD88 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FE2C 0033CD8C 7C 08 02 A6 */ mflr r0 +/* 8033FE30 0033CD90 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FE34 0033CD94 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FE38 0033CD98 7C 9F 23 78 */ mr r31, r4 +/* 8033FE3C 0033CD9C 93 C1 00 08 */ stw r30, 8(r1) +/* 8033FE40 0033CDA0 7C 7E 1B 79 */ or. r30, r3, r3 +/* 8033FE44 0033CDA4 41 82 00 90 */ beq lbl_8033FED4 +/* 8033FE48 0033CDA8 80 7E 00 10 */ lwz r3, 0x10(r30) +/* 8033FE4C 0033CDAC 28 03 00 00 */ cmplwi r3, 0 +/* 8033FE50 0033CDB0 41 82 00 20 */ beq lbl_8033FE70 +/* 8033FE54 0033CDB4 41 82 00 58 */ beq lbl_8033FEAC +/* 8033FE58 0033CDB8 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FE5C 0033CDBC 38 80 00 01 */ li r4, 1 +/* 8033FE60 0033CDC0 81 8C 00 08 */ lwz r12, 8(r12) +/* 8033FE64 0033CDC4 7D 89 03 A6 */ mtctr r12 +/* 8033FE68 0033CDC8 4E 80 04 21 */ bctrl +/* 8033FE6C 0033CDCC 48 00 00 40 */ b lbl_8033FEAC +lbl_8033FE70: +/* 8033FE70 0033CDD0 88 1E 00 03 */ lbz r0, 3(r30) +/* 8033FE74 0033CDD4 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 +/* 8033FE78 0033CDD8 7C 00 FE 70 */ srawi r0, r0, 0x1f +/* 8033FE7C 0033CDDC 7C 00 07 75 */ extsb. r0, r0 +/* 8033FE80 0033CDE0 41 82 00 2C */ beq lbl_8033FEAC +/* 8033FE84 0033CDE4 80 7E 00 0C */ lwz r3, 0xc(r30) +/* 8033FE88 0033CDE8 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FE8C 0033CDEC 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 8033FE90 0033CDF0 7D 89 03 A6 */ mtctr r12 +/* 8033FE94 0033CDF4 4E 80 04 21 */ bctrl +/* 8033FE98 0033CDF8 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FE9C 0033CDFC 38 9E 00 04 */ addi r4, r30, 4 +/* 8033FEA0 0033CE00 81 8C 00 14 */ lwz r12, 0x14(r12) +/* 8033FEA4 0033CE04 7D 89 03 A6 */ mtctr r12 +/* 8033FEA8 0033CE08 4E 80 04 21 */ bctrl +lbl_8033FEAC: +/* 8033FEAC 0033CE0C 34 1E 00 14 */ addic. r0, r30, 0x14 +/* 8033FEB0 0033CE10 41 82 00 14 */ beq lbl_8033FEC4 +/* 8033FEB4 0033CE14 34 1E 00 14 */ addic. r0, r30, 0x14 +/* 8033FEB8 0033CE18 41 82 00 0C */ beq lbl_8033FEC4 +/* 8033FEBC 0033CE1C 38 7E 00 14 */ addi r3, r30, 0x14 +/* 8033FEC0 0033CE20 4B CF 44 45 */ bl sub_80034304 +lbl_8033FEC4: +/* 8033FEC4 0033CE24 7F E0 07 35 */ extsh. r0, r31 +/* 8033FEC8 0033CE28 40 81 00 0C */ ble lbl_8033FED4 +/* 8033FECC 0033CE2C 7F C3 F3 78 */ mr r3, r30 +/* 8033FED0 0033CE30 4B FD 5A 61 */ bl Free__7CMemoryFPCv +lbl_8033FED4: +/* 8033FED4 0033CE34 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FED8 0033CE38 7F C3 F3 78 */ mr r3, r30 +/* 8033FEDC 0033CE3C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FEE0 0033CE40 83 C1 00 08 */ lwz r30, 8(r1) +/* 8033FEE4 0033CE44 7C 08 03 A6 */ mtlr r0 +/* 8033FEE8 0033CE48 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FEEC 0033CE4C 4E 80 00 20 */ blr + +.global "__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>" +"__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>": +/* 8033FEF0 0033CE50 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8033FEF4 0033CE54 7C 08 02 A6 */ mflr r0 +/* 8033FEF8 0033CE58 38 A0 00 00 */ li r5, 0 +/* 8033FEFC 0033CE5C 90 01 00 24 */ stw r0, 0x24(r1) +/* 8033FF00 0033CE60 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8033FF04 0033CE64 7C 7F 1B 78 */ mr r31, r3 +/* 8033FF08 0033CE68 A8 03 00 00 */ lha r0, 0(r3) +/* 8033FF0C 0033CE6C 50 A0 04 3E */ rlwimi r0, r5, 0, 0x10, 0x1f +/* 8033FF10 0033CE70 38 61 00 08 */ addi r3, r1, 8 +/* 8033FF14 0033CE74 B0 1F 00 00 */ sth r0, 0(r31) +/* 8033FF18 0033CE78 A8 1F 00 02 */ lha r0, 2(r31) +/* 8033FF1C 0033CE7C 50 A0 0C 3C */ rlwimi r0, r5, 1, 0x10, 0x1e +/* 8033FF20 0033CE80 B0 1F 00 02 */ sth r0, 2(r31) +/* 8033FF24 0033CE84 A8 1F 00 02 */ lha r0, 2(r31) +/* 8033FF28 0033CE88 50 A0 07 FE */ rlwimi r0, r5, 0, 0x1f, 0x1f +/* 8033FF2C 0033CE8C B0 1F 00 02 */ sth r0, 2(r31) +/* 8033FF30 0033CE90 90 BF 00 0C */ stw r5, 0xc(r31) +/* 8033FF34 0033CE94 98 A4 00 00 */ stb r5, 0(r4) +/* 8033FF38 0033CE98 80 04 00 04 */ lwz r0, 4(r4) +/* 8033FF3C 0033CE9C 90 1F 00 10 */ stw r0, 0x10(r31) +/* 8033FF40 0033CEA0 4B CF 4A 15 */ bl Null__15CVParamTransferFv +/* 8033FF44 0033CEA4 80 01 00 08 */ lwz r0, 8(r1) +/* 8033FF48 0033CEA8 38 61 00 08 */ addi r3, r1, 8 +/* 8033FF4C 0033CEAC 90 1F 00 14 */ stw r0, 0x14(r31) +/* 8033FF50 0033CEB0 80 BF 00 14 */ lwz r5, 0x14(r31) +/* 8033FF54 0033CEB4 80 85 00 04 */ lwz r4, 4(r5) +/* 8033FF58 0033CEB8 38 04 00 01 */ addi r0, r4, 1 +/* 8033FF5C 0033CEBC 90 05 00 04 */ stw r0, 4(r5) +/* 8033FF60 0033CEC0 4B CF 43 A5 */ bl sub_80034304 +/* 8033FF64 0033CEC4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8033FF68 0033CEC8 7F E3 FB 78 */ mr r3, r31 +/* 8033FF6C 0033CECC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8033FF70 0033CED0 7C 08 03 A6 */ mtlr r0 +/* 8033FF74 0033CED4 38 21 00 20 */ addi r1, r1, 0x20 +/* 8033FF78 0033CED8 4E 80 00 20 */ blr +.include "macros.inc" + +.section .text, "ax" + +.global "__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer" +"__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer": +/* 8033FF7C 0033CEDC 39 00 00 00 */ li r8, 0 +/* 8033FF80 0033CEE0 A8 03 00 00 */ lha r0, 0(r3) +/* 8033FF84 0033CEE4 51 00 04 3E */ rlwimi r0, r8, 0, 0x10, 0x1f +/* 8033FF88 0033CEE8 B0 03 00 00 */ sth r0, 0(r3) +/* 8033FF8C 0033CEEC A8 03 00 02 */ lha r0, 2(r3) +/* 8033FF90 0033CEF0 51 00 0C 3C */ rlwimi r0, r8, 1, 0x10, 0x1e +/* 8033FF94 0033CEF4 B0 03 00 02 */ sth r0, 2(r3) +/* 8033FF98 0033CEF8 A8 03 00 02 */ lha r0, 2(r3) +/* 8033FF9C 0033CEFC 51 00 07 FE */ rlwimi r0, r8, 0, 0x1f, 0x1f +/* 8033FFA0 0033CF00 B0 03 00 02 */ sth r0, 2(r3) +/* 8033FFA4 0033CF04 80 06 00 00 */ lwz r0, 0(r6) +/* 8033FFA8 0033CF08 90 03 00 04 */ stw r0, 4(r3) +/* 8033FFAC 0033CF0C 80 06 00 04 */ lwz r0, 4(r6) +/* 8033FFB0 0033CF10 90 03 00 08 */ stw r0, 8(r3) +/* 8033FFB4 0033CF14 90 83 00 0C */ stw r4, 0xc(r3) +/* 8033FFB8 0033CF18 99 05 00 00 */ stb r8, 0(r5) +/* 8033FFBC 0033CF1C 80 05 00 04 */ lwz r0, 4(r5) +/* 8033FFC0 0033CF20 90 03 00 10 */ stw r0, 0x10(r3) +/* 8033FFC4 0033CF24 80 07 00 00 */ lwz r0, 0(r7) +/* 8033FFC8 0033CF28 90 03 00 14 */ stw r0, 0x14(r3) +/* 8033FFCC 0033CF2C 80 A3 00 14 */ lwz r5, 0x14(r3) +/* 8033FFD0 0033CF30 80 85 00 04 */ lwz r4, 4(r5) +/* 8033FFD4 0033CF34 38 04 00 01 */ addi r0, r4, 1 +/* 8033FFD8 0033CF38 90 05 00 04 */ stw r0, 4(r5) +/* 8033FFDC 0033CF3C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CSimplePool.s b/asm/Kyoto/CSimplePool.s index 699c4539..e6259d1c 100644 --- a/asm/Kyoto/CSimplePool.s +++ b/asm/Kyoto/CSimplePool.s @@ -3,28 +3,6 @@ .section .data .balign 8 -.global lbl_803EE3D8 -lbl_803EE3D8: - # ROM: 0x3EB3D8 - .4byte 0 - .4byte 0 - .4byte "__dt__31TObjOwnerParamFv" - -.global lbl_803EE3E4 -lbl_803EE3E4: - # ROM: 0x3EB3E4 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .global lbl_803EE410 lbl_803EE410: # ROM: 0x3EB410 @@ -89,413 +67,6 @@ lbl_805A9508: .section .text, "ax" -.global "__dt__31TObjOwnerParamFv" -"__dt__31TObjOwnerParamFv": -/* 8033FA48 0033C9A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FA4C 0033C9AC 7C 08 02 A6 */ mflr r0 -/* 8033FA50 0033C9B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FA54 0033C9B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FA58 0033C9B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8033FA5C 0033C9BC 41 82 00 40 */ beq lbl_8033FA9C -/* 8033FA60 0033C9C0 3C 60 80 3F */ lis r3, lbl_803EE3D8@ha -/* 8033FA64 0033C9C4 38 03 E3 D8 */ addi r0, r3, lbl_803EE3D8@l -/* 8033FA68 0033C9C8 90 1F 00 00 */ stw r0, 0(r31) -/* 8033FA6C 0033C9CC 41 82 00 20 */ beq lbl_8033FA8C -/* 8033FA70 0033C9D0 3C 60 80 3E */ lis r3, lbl_803D9C44@ha -/* 8033FA74 0033C9D4 38 03 9C 44 */ addi r0, r3, lbl_803D9C44@l -/* 8033FA78 0033C9D8 90 1F 00 00 */ stw r0, 0(r31) -/* 8033FA7C 0033C9DC 41 82 00 10 */ beq lbl_8033FA8C -/* 8033FA80 0033C9E0 3C 60 80 3E */ lis r3, __vt__4IObj@ha -/* 8033FA84 0033C9E4 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l -/* 8033FA88 0033C9E8 90 1F 00 00 */ stw r0, 0(r31) -lbl_8033FA8C: -/* 8033FA8C 0033C9EC 7C 80 07 35 */ extsh. r0, r4 -/* 8033FA90 0033C9F0 40 81 00 0C */ ble lbl_8033FA9C -/* 8033FA94 0033C9F4 7F E3 FB 78 */ mr r3, r31 -/* 8033FA98 0033C9F8 4B FD 5E 99 */ bl Free__7CMemoryFPCv -lbl_8033FA9C: -/* 8033FA9C 0033C9FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FAA0 0033CA00 7F E3 FB 78 */ mr r3, r31 -/* 8033FAA4 0033CA04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FAA8 0033CA08 7C 08 03 A6 */ mtlr r0 -/* 8033FAAC 0033CA0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FAB0 0033CA10 4E 80 00 20 */ blr - -.global IsLoading__16CObjectReferenceCFv -IsLoading__16CObjectReferenceCFv: -/* 8033FAB4 0033CA14 88 03 00 03 */ lbz r0, 3(r3) -/* 8033FAB8 0033CA18 38 80 00 00 */ li r4, 0 -/* 8033FABC 0033CA1C 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 -/* 8033FAC0 0033CA20 7C 00 FE 70 */ srawi r0, r0, 0x1f -/* 8033FAC4 0033CA24 7C 00 07 75 */ extsb. r0, r0 -/* 8033FAC8 0033CA28 41 82 00 14 */ beq lbl_8033FADC -/* 8033FACC 0033CA2C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8033FAD0 0033CA30 28 00 00 00 */ cmplwi r0, 0 -/* 8033FAD4 0033CA34 40 82 00 08 */ bne lbl_8033FADC -/* 8033FAD8 0033CA38 38 80 00 01 */ li r4, 1 -lbl_8033FADC: -/* 8033FADC 0033CA3C 7C 83 23 78 */ mr r3, r4 -/* 8033FAE0 0033CA40 4E 80 00 20 */ blr - -.global Unlock__16CObjectReferenceFv -Unlock__16CObjectReferenceFv: -/* 8033FAE4 0033CA44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FAE8 0033CA48 7C 08 02 A6 */ mflr r0 -/* 8033FAEC 0033CA4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FAF0 0033CA50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FAF4 0033CA54 7C 7F 1B 78 */ mr r31, r3 -/* 8033FAF8 0033CA58 A8 A3 00 02 */ lha r5, 2(r3) -/* 8033FAFC 0033CA5C 54 A0 80 1E */ slwi r0, r5, 0x10 -/* 8033FB00 0033CA60 7C 04 8E 70 */ srawi r4, r0, 0x11 -/* 8033FB04 0033CA64 38 04 FF FF */ addi r0, r4, -1 -/* 8033FB08 0033CA68 50 05 0C 3C */ rlwimi r5, r0, 1, 0x10, 0x1e -/* 8033FB0C 0033CA6C B0 A3 00 02 */ sth r5, 2(r3) -/* 8033FB10 0033CA70 A8 03 00 02 */ lha r0, 2(r3) -/* 8033FB14 0033CA74 54 00 80 1E */ slwi r0, r0, 0x10 -/* 8033FB18 0033CA78 7C 00 8E 70 */ srawi r0, r0, 0x11 -/* 8033FB1C 0033CA7C 7C 00 07 35 */ extsh. r0, r0 -/* 8033FB20 0033CA80 40 82 00 3C */ bne lbl_8033FB5C -/* 8033FB24 0033CA84 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 8033FB28 0033CA88 28 00 00 00 */ cmplwi r0, 0 -/* 8033FB2C 0033CA8C 41 82 00 18 */ beq lbl_8033FB44 -/* 8033FB30 0033CA90 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 8033FB34 0033CA94 28 00 00 00 */ cmplwi r0, 0 -/* 8033FB38 0033CA98 41 82 00 0C */ beq lbl_8033FB44 -/* 8033FB3C 0033CA9C 48 00 01 39 */ bl Unload__16CObjectReferenceFv -/* 8033FB40 0033CAA0 48 00 00 1C */ b lbl_8033FB5C -lbl_8033FB44: -/* 8033FB44 0033CAA4 7F E3 FB 78 */ mr r3, r31 -/* 8033FB48 0033CAA8 4B FF FF 6D */ bl IsLoading__16CObjectReferenceCFv -/* 8033FB4C 0033CAAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8033FB50 0033CAB0 41 82 00 0C */ beq lbl_8033FB5C -/* 8033FB54 0033CAB4 7F E3 FB 78 */ mr r3, r31 -/* 8033FB58 0033CAB8 48 00 00 A5 */ bl CancelLoad__16CObjectReferenceFv -lbl_8033FB5C: -/* 8033FB5C 0033CABC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FB60 0033CAC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FB64 0033CAC4 7C 08 03 A6 */ mtlr r0 -/* 8033FB68 0033CAC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FB6C 0033CACC 4E 80 00 20 */ blr - -.global RemoveReference__16CObjectReferenceFv -RemoveReference__16CObjectReferenceFv: -/* 8033FB70 0033CAD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FB74 0033CAD4 7C 08 02 A6 */ mflr r0 -/* 8033FB78 0033CAD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FB7C 0033CADC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FB80 0033CAE0 7C 7F 1B 78 */ mr r31, r3 -/* 8033FB84 0033CAE4 A8 83 00 00 */ lha r4, 0(r3) -/* 8033FB88 0033CAE8 38 04 FF FF */ addi r0, r4, -1 -/* 8033FB8C 0033CAEC B0 03 00 00 */ sth r0, 0(r3) -/* 8033FB90 0033CAF0 A8 03 00 00 */ lha r0, 0(r3) -/* 8033FB94 0033CAF4 2C 00 00 00 */ cmpwi r0, 0 -/* 8033FB98 0033CAF8 40 82 00 4C */ bne lbl_8033FBE4 -/* 8033FB9C 0033CAFC 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 8033FBA0 0033CB00 28 00 00 00 */ cmplwi r0, 0 -/* 8033FBA4 0033CB04 41 82 00 0C */ beq lbl_8033FBB0 -/* 8033FBA8 0033CB08 48 00 00 CD */ bl Unload__16CObjectReferenceFv -/* 8033FBAC 0033CB0C 48 00 00 18 */ b lbl_8033FBC4 -lbl_8033FBB0: -/* 8033FBB0 0033CB10 4B FF FF 05 */ bl IsLoading__16CObjectReferenceCFv -/* 8033FBB4 0033CB14 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8033FBB8 0033CB18 41 82 00 0C */ beq lbl_8033FBC4 -/* 8033FBBC 0033CB1C 7F E3 FB 78 */ mr r3, r31 -/* 8033FBC0 0033CB20 48 00 00 3D */ bl CancelLoad__16CObjectReferenceFv -lbl_8033FBC4: -/* 8033FBC4 0033CB24 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8033FBC8 0033CB28 28 03 00 00 */ cmplwi r3, 0 -/* 8033FBCC 0033CB2C 41 82 00 18 */ beq lbl_8033FBE4 -/* 8033FBD0 0033CB30 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FBD4 0033CB34 38 9F 00 04 */ addi r4, r31, 4 -/* 8033FBD8 0033CB38 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 8033FBDC 0033CB3C 7D 89 03 A6 */ mtctr r12 -/* 8033FBE0 0033CB40 4E 80 04 21 */ bctrl -lbl_8033FBE4: -/* 8033FBE4 0033CB44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FBE8 0033CB48 A8 7F 00 00 */ lha r3, 0(r31) -/* 8033FBEC 0033CB4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FBF0 0033CB50 7C 08 03 A6 */ mtlr r0 -/* 8033FBF4 0033CB54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FBF8 0033CB58 4E 80 00 20 */ blr - -.global CancelLoad__16CObjectReferenceFv -CancelLoad__16CObjectReferenceFv: -/* 8033FBFC 0033CB5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FC00 0033CB60 7C 08 02 A6 */ mflr r0 -/* 8033FC04 0033CB64 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FC08 0033CB68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FC0C 0033CB6C 7C 7F 1B 78 */ mr r31, r3 -/* 8033FC10 0033CB70 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8033FC14 0033CB74 28 00 00 00 */ cmplwi r0, 0 -/* 8033FC18 0033CB78 41 82 00 48 */ beq lbl_8033FC60 -/* 8033FC1C 0033CB7C 4B FF FE 99 */ bl IsLoading__16CObjectReferenceCFv -/* 8033FC20 0033CB80 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8033FC24 0033CB84 41 82 00 3C */ beq lbl_8033FC60 -/* 8033FC28 0033CB88 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8033FC2C 0033CB8C 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FC30 0033CB90 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8033FC34 0033CB94 7D 89 03 A6 */ mtctr r12 -/* 8033FC38 0033CB98 4E 80 04 21 */ bctrl -/* 8033FC3C 0033CB9C 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FC40 0033CBA0 38 9F 00 04 */ addi r4, r31, 4 -/* 8033FC44 0033CBA4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8033FC48 0033CBA8 7D 89 03 A6 */ mtctr r12 -/* 8033FC4C 0033CBAC 4E 80 04 21 */ bctrl -/* 8033FC50 0033CBB0 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FC54 0033CBB4 38 60 00 00 */ li r3, 0 -/* 8033FC58 0033CBB8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 8033FC5C 0033CBBC 98 1F 00 03 */ stb r0, 3(r31) -lbl_8033FC60: -/* 8033FC60 0033CBC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FC64 0033CBC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FC68 0033CBC8 7C 08 03 A6 */ mtlr r0 -/* 8033FC6C 0033CBCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FC70 0033CBD0 4E 80 00 20 */ blr - -.global Unload__16CObjectReferenceFv -Unload__16CObjectReferenceFv: -/* 8033FC74 0033CBD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FC78 0033CBD8 7C 08 02 A6 */ mflr r0 -/* 8033FC7C 0033CBDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FC80 0033CBE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FC84 0033CBE4 7C 7F 1B 78 */ mr r31, r3 -/* 8033FC88 0033CBE8 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8033FC8C 0033CBEC 28 03 00 00 */ cmplwi r3, 0 -/* 8033FC90 0033CBF0 41 82 00 18 */ beq lbl_8033FCA8 -/* 8033FC94 0033CBF4 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FC98 0033CBF8 38 80 00 01 */ li r4, 1 -/* 8033FC9C 0033CBFC 81 8C 00 08 */ lwz r12, 8(r12) -/* 8033FCA0 0033CC00 7D 89 03 A6 */ mtctr r12 -/* 8033FCA4 0033CC04 4E 80 04 21 */ bctrl -lbl_8033FCA8: -/* 8033FCA8 0033CC08 38 60 00 00 */ li r3, 0 -/* 8033FCAC 0033CC0C 90 7F 00 10 */ stw r3, 0x10(r31) -/* 8033FCB0 0033CC10 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FCB4 0033CC14 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 8033FCB8 0033CC18 98 1F 00 03 */ stb r0, 3(r31) -/* 8033FCBC 0033CC1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FCC0 0033CC20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FCC4 0033CC24 7C 08 03 A6 */ mtlr r0 -/* 8033FCC8 0033CC28 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FCCC 0033CC2C 4E 80 00 20 */ blr - -.global GetObject__16CObjectReferenceFv -GetObject__16CObjectReferenceFv: -/* 8033FCD0 0033CC30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8033FCD4 0033CC34 7C 08 02 A6 */ mflr r0 -/* 8033FCD8 0033CC38 90 01 00 24 */ stw r0, 0x24(r1) -/* 8033FCDC 0033CC3C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8033FCE0 0033CC40 7C 7F 1B 78 */ mr r31, r3 -/* 8033FCE4 0033CC44 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8033FCE8 0033CC48 28 00 00 00 */ cmplwi r0, 0 -/* 8033FCEC 0033CC4C 40 82 00 74 */ bne lbl_8033FD60 -/* 8033FCF0 0033CC50 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8033FCF4 0033CC54 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FCF8 0033CC58 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8033FCFC 0033CC5C 7D 89 03 A6 */ mtctr r12 -/* 8033FD00 0033CC60 4E 80 04 21 */ bctrl -/* 8033FD04 0033CC64 7C 64 1B 78 */ mr r4, r3 -/* 8033FD08 0033CC68 38 61 00 08 */ addi r3, r1, 8 -/* 8033FD0C 0033CC6C 81 84 00 00 */ lwz r12, 0(r4) -/* 8033FD10 0033CC70 38 BF 00 04 */ addi r5, r31, 4 -/* 8033FD14 0033CC74 38 DF 00 14 */ addi r6, r31, 0x14 -/* 8033FD18 0033CC78 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8033FD1C 0033CC7C 7D 89 03 A6 */ mtctr r12 -/* 8033FD20 0033CC80 4E 80 04 21 */ bctrl -/* 8033FD24 0033CC84 38 00 00 00 */ li r0, 0 -/* 8033FD28 0033CC88 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8033FD2C 0033CC8C 98 01 00 08 */ stb r0, 8(r1) -/* 8033FD30 0033CC90 90 7F 00 10 */ stw r3, 0x10(r31) -/* 8033FD34 0033CC94 88 01 00 08 */ lbz r0, 8(r1) -/* 8033FD38 0033CC98 28 00 00 00 */ cmplwi r0, 0 -/* 8033FD3C 0033CC9C 41 82 00 24 */ beq lbl_8033FD60 -/* 8033FD40 0033CCA0 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8033FD44 0033CCA4 28 03 00 00 */ cmplwi r3, 0 -/* 8033FD48 0033CCA8 41 82 00 18 */ beq lbl_8033FD60 -/* 8033FD4C 0033CCAC 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FD50 0033CCB0 38 80 00 01 */ li r4, 1 -/* 8033FD54 0033CCB4 81 8C 00 08 */ lwz r12, 8(r12) -/* 8033FD58 0033CCB8 7D 89 03 A6 */ mtctr r12 -/* 8033FD5C 0033CCBC 4E 80 04 21 */ bctrl -lbl_8033FD60: -/* 8033FD60 0033CCC0 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FD64 0033CCC4 38 60 00 00 */ li r3, 0 -/* 8033FD68 0033CCC8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 8033FD6C 0033CCCC 98 1F 00 03 */ stb r0, 3(r31) -/* 8033FD70 0033CCD0 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 8033FD74 0033CCD4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8033FD78 0033CCD8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8033FD7C 0033CCDC 7C 08 03 A6 */ mtlr r0 -/* 8033FD80 0033CCE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033FD84 0033CCE4 4E 80 00 20 */ blr - -.global Lock__16CObjectReferenceFv -Lock__16CObjectReferenceFv: -/* 8033FD88 0033CCE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FD8C 0033CCEC 7C 08 02 A6 */ mflr r0 -/* 8033FD90 0033CCF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FD94 0033CCF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FD98 0033CCF8 7C 7F 1B 78 */ mr r31, r3 -/* 8033FD9C 0033CCFC A8 83 00 02 */ lha r4, 2(r3) -/* 8033FDA0 0033CD00 54 80 80 1E */ slwi r0, r4, 0x10 -/* 8033FDA4 0033CD04 7C 03 8E 70 */ srawi r3, r0, 0x11 -/* 8033FDA8 0033CD08 38 03 00 01 */ addi r0, r3, 1 -/* 8033FDAC 0033CD0C 50 04 0C 3C */ rlwimi r4, r0, 1, 0x10, 0x1e -/* 8033FDB0 0033CD10 B0 9F 00 02 */ sth r4, 2(r31) -/* 8033FDB4 0033CD14 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 8033FDB8 0033CD18 28 00 00 00 */ cmplwi r0, 0 -/* 8033FDBC 0033CD1C 40 82 00 58 */ bne lbl_8033FE14 -/* 8033FDC0 0033CD20 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FDC4 0033CD24 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 -/* 8033FDC8 0033CD28 7C 00 FE 70 */ srawi r0, r0, 0x1f -/* 8033FDCC 0033CD2C 7C 00 07 75 */ extsb. r0, r0 -/* 8033FDD0 0033CD30 40 82 00 44 */ bne lbl_8033FE14 -/* 8033FDD4 0033CD34 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8033FDD8 0033CD38 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FDDC 0033CD3C 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8033FDE0 0033CD40 7D 89 03 A6 */ mtctr r12 -/* 8033FDE4 0033CD44 4E 80 04 21 */ bctrl -/* 8033FDE8 0033CD48 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FDEC 0033CD4C 38 9F 00 04 */ addi r4, r31, 4 -/* 8033FDF0 0033CD50 38 BF 00 14 */ addi r5, r31, 0x14 -/* 8033FDF4 0033CD54 38 DF 00 10 */ addi r6, r31, 0x10 -/* 8033FDF8 0033CD58 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8033FDFC 0033CD5C 7D 89 03 A6 */ mtctr r12 -/* 8033FE00 0033CD60 4E 80 04 21 */ bctrl -/* 8033FE04 0033CD64 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FE08 0033CD68 38 60 00 01 */ li r3, 1 -/* 8033FE0C 0033CD6C 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 8033FE10 0033CD70 98 1F 00 03 */ stb r0, 3(r31) -lbl_8033FE14: -/* 8033FE14 0033CD74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FE18 0033CD78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FE1C 0033CD7C 7C 08 03 A6 */ mtlr r0 -/* 8033FE20 0033CD80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FE24 0033CD84 4E 80 00 20 */ blr - -.global __dt__16CObjectReferenceFv -__dt__16CObjectReferenceFv: -/* 8033FE28 0033CD88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FE2C 0033CD8C 7C 08 02 A6 */ mflr r0 -/* 8033FE30 0033CD90 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FE34 0033CD94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FE38 0033CD98 7C 9F 23 78 */ mr r31, r4 -/* 8033FE3C 0033CD9C 93 C1 00 08 */ stw r30, 8(r1) -/* 8033FE40 0033CDA0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8033FE44 0033CDA4 41 82 00 90 */ beq lbl_8033FED4 -/* 8033FE48 0033CDA8 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8033FE4C 0033CDAC 28 03 00 00 */ cmplwi r3, 0 -/* 8033FE50 0033CDB0 41 82 00 20 */ beq lbl_8033FE70 -/* 8033FE54 0033CDB4 41 82 00 58 */ beq lbl_8033FEAC -/* 8033FE58 0033CDB8 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FE5C 0033CDBC 38 80 00 01 */ li r4, 1 -/* 8033FE60 0033CDC0 81 8C 00 08 */ lwz r12, 8(r12) -/* 8033FE64 0033CDC4 7D 89 03 A6 */ mtctr r12 -/* 8033FE68 0033CDC8 4E 80 04 21 */ bctrl -/* 8033FE6C 0033CDCC 48 00 00 40 */ b lbl_8033FEAC -lbl_8033FE70: -/* 8033FE70 0033CDD0 88 1E 00 03 */ lbz r0, 3(r30) -/* 8033FE74 0033CDD4 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 -/* 8033FE78 0033CDD8 7C 00 FE 70 */ srawi r0, r0, 0x1f -/* 8033FE7C 0033CDDC 7C 00 07 75 */ extsb. r0, r0 -/* 8033FE80 0033CDE0 41 82 00 2C */ beq lbl_8033FEAC -/* 8033FE84 0033CDE4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8033FE88 0033CDE8 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FE8C 0033CDEC 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8033FE90 0033CDF0 7D 89 03 A6 */ mtctr r12 -/* 8033FE94 0033CDF4 4E 80 04 21 */ bctrl -/* 8033FE98 0033CDF8 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FE9C 0033CDFC 38 9E 00 04 */ addi r4, r30, 4 -/* 8033FEA0 0033CE00 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8033FEA4 0033CE04 7D 89 03 A6 */ mtctr r12 -/* 8033FEA8 0033CE08 4E 80 04 21 */ bctrl -lbl_8033FEAC: -/* 8033FEAC 0033CE0C 34 1E 00 14 */ addic. r0, r30, 0x14 -/* 8033FEB0 0033CE10 41 82 00 14 */ beq lbl_8033FEC4 -/* 8033FEB4 0033CE14 34 1E 00 14 */ addic. r0, r30, 0x14 -/* 8033FEB8 0033CE18 41 82 00 0C */ beq lbl_8033FEC4 -/* 8033FEBC 0033CE1C 38 7E 00 14 */ addi r3, r30, 0x14 -/* 8033FEC0 0033CE20 4B CF 44 45 */ bl sub_80034304 -lbl_8033FEC4: -/* 8033FEC4 0033CE24 7F E0 07 35 */ extsh. r0, r31 -/* 8033FEC8 0033CE28 40 81 00 0C */ ble lbl_8033FED4 -/* 8033FECC 0033CE2C 7F C3 F3 78 */ mr r3, r30 -/* 8033FED0 0033CE30 4B FD 5A 61 */ bl Free__7CMemoryFPCv -lbl_8033FED4: -/* 8033FED4 0033CE34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FED8 0033CE38 7F C3 F3 78 */ mr r3, r30 -/* 8033FEDC 0033CE3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FEE0 0033CE40 83 C1 00 08 */ lwz r30, 8(r1) -/* 8033FEE4 0033CE44 7C 08 03 A6 */ mtlr r0 -/* 8033FEE8 0033CE48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FEEC 0033CE4C 4E 80 00 20 */ blr - -.global "__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>" -"__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>": -/* 8033FEF0 0033CE50 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8033FEF4 0033CE54 7C 08 02 A6 */ mflr r0 -/* 8033FEF8 0033CE58 38 A0 00 00 */ li r5, 0 -/* 8033FEFC 0033CE5C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8033FF00 0033CE60 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8033FF04 0033CE64 7C 7F 1B 78 */ mr r31, r3 -/* 8033FF08 0033CE68 A8 03 00 00 */ lha r0, 0(r3) -/* 8033FF0C 0033CE6C 50 A0 04 3E */ rlwimi r0, r5, 0, 0x10, 0x1f -/* 8033FF10 0033CE70 38 61 00 08 */ addi r3, r1, 8 -/* 8033FF14 0033CE74 B0 1F 00 00 */ sth r0, 0(r31) -/* 8033FF18 0033CE78 A8 1F 00 02 */ lha r0, 2(r31) -/* 8033FF1C 0033CE7C 50 A0 0C 3C */ rlwimi r0, r5, 1, 0x10, 0x1e -/* 8033FF20 0033CE80 B0 1F 00 02 */ sth r0, 2(r31) -/* 8033FF24 0033CE84 A8 1F 00 02 */ lha r0, 2(r31) -/* 8033FF28 0033CE88 50 A0 07 FE */ rlwimi r0, r5, 0, 0x1f, 0x1f -/* 8033FF2C 0033CE8C B0 1F 00 02 */ sth r0, 2(r31) -/* 8033FF30 0033CE90 90 BF 00 0C */ stw r5, 0xc(r31) -/* 8033FF34 0033CE94 98 A4 00 00 */ stb r5, 0(r4) -/* 8033FF38 0033CE98 80 04 00 04 */ lwz r0, 4(r4) -/* 8033FF3C 0033CE9C 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8033FF40 0033CEA0 4B CF 4A 15 */ bl Null__15CVParamTransferFv -/* 8033FF44 0033CEA4 80 01 00 08 */ lwz r0, 8(r1) -/* 8033FF48 0033CEA8 38 61 00 08 */ addi r3, r1, 8 -/* 8033FF4C 0033CEAC 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8033FF50 0033CEB0 80 BF 00 14 */ lwz r5, 0x14(r31) -/* 8033FF54 0033CEB4 80 85 00 04 */ lwz r4, 4(r5) -/* 8033FF58 0033CEB8 38 04 00 01 */ addi r0, r4, 1 -/* 8033FF5C 0033CEBC 90 05 00 04 */ stw r0, 4(r5) -/* 8033FF60 0033CEC0 4B CF 43 A5 */ bl sub_80034304 -/* 8033FF64 0033CEC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8033FF68 0033CEC8 7F E3 FB 78 */ mr r3, r31 -/* 8033FF6C 0033CECC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8033FF70 0033CED0 7C 08 03 A6 */ mtlr r0 -/* 8033FF74 0033CED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033FF78 0033CED8 4E 80 00 20 */ blr - -.global "__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer" -"__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer": -/* 8033FF7C 0033CEDC 39 00 00 00 */ li r8, 0 -/* 8033FF80 0033CEE0 A8 03 00 00 */ lha r0, 0(r3) -/* 8033FF84 0033CEE4 51 00 04 3E */ rlwimi r0, r8, 0, 0x10, 0x1f -/* 8033FF88 0033CEE8 B0 03 00 00 */ sth r0, 0(r3) -/* 8033FF8C 0033CEEC A8 03 00 02 */ lha r0, 2(r3) -/* 8033FF90 0033CEF0 51 00 0C 3C */ rlwimi r0, r8, 1, 0x10, 0x1e -/* 8033FF94 0033CEF4 B0 03 00 02 */ sth r0, 2(r3) -/* 8033FF98 0033CEF8 A8 03 00 02 */ lha r0, 2(r3) -/* 8033FF9C 0033CEFC 51 00 07 FE */ rlwimi r0, r8, 0, 0x1f, 0x1f -/* 8033FFA0 0033CF00 B0 03 00 02 */ sth r0, 2(r3) -/* 8033FFA4 0033CF04 80 06 00 00 */ lwz r0, 0(r6) -/* 8033FFA8 0033CF08 90 03 00 04 */ stw r0, 4(r3) -/* 8033FFAC 0033CF0C 80 06 00 04 */ lwz r0, 4(r6) -/* 8033FFB0 0033CF10 90 03 00 08 */ stw r0, 8(r3) -/* 8033FFB4 0033CF14 90 83 00 0C */ stw r4, 0xc(r3) -/* 8033FFB8 0033CF18 99 05 00 00 */ stb r8, 0(r5) -/* 8033FFBC 0033CF1C 80 05 00 04 */ lwz r0, 4(r5) -/* 8033FFC0 0033CF20 90 03 00 10 */ stw r0, 0x10(r3) -/* 8033FFC4 0033CF24 80 07 00 00 */ lwz r0, 0(r7) -/* 8033FFC8 0033CF28 90 03 00 14 */ stw r0, 0x14(r3) -/* 8033FFCC 0033CF2C 80 A3 00 14 */ lwz r5, 0x14(r3) -/* 8033FFD0 0033CF30 80 85 00 04 */ lwz r4, 4(r5) -/* 8033FFD4 0033CF34 38 04 00 01 */ addi r0, r4, 1 -/* 8033FFD8 0033CF38 90 05 00 04 */ stw r0, 4(r5) -/* 8033FFDC 0033CF3C 4E 80 00 20 */ blr - .global GetFactory__11CSimplePoolCFv GetFactory__11CSimplePoolCFv: /* 8033FFE0 0033CF40 80 63 00 18 */ lwz r3, 0x18(r3) diff --git a/configure.py b/configure.py index df29650e..bca58ecd 100755 --- a/configure.py +++ b/configure.py @@ -631,6 +631,8 @@ LIBS = [ ["Kyoto/Streams/COutputStream", True], ["Kyoto/Streams/CZipInputStream", True], ["Kyoto/Streams/CZipSupport", True], + "Kyoto/CFactoryStore", + "Kyoto/CObjectReference", "Kyoto/CSimplePool", ["Kyoto/CToken", True], ["Kyoto/IObj", True], diff --git a/ldscript.lcf b/ldscript.lcf index 9aa0efd0..5436fef0 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -34,5 +34,4 @@ SECTIONS FORCEFILES { - } diff --git a/obj_files.mk b/obj_files.mk index 6f42e012..a697e86a 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -562,6 +562,8 @@ KYOTO_1 :=\ $(BUILD_DIR)/src/Kyoto/Streams/COutputStream.o\ $(BUILD_DIR)/src/Kyoto/Streams/CZipInputStream.o\ $(BUILD_DIR)/src/Kyoto/Streams/CZipSupport.o\ + $(BUILD_DIR)/asm/Kyoto/CFactoryStore.o\ + $(BUILD_DIR)/asm/Kyoto/CObjectReference.o\ $(BUILD_DIR)/asm/Kyoto/CSimplePool.o\ $(BUILD_DIR)/src/Kyoto/CToken.o\ $(BUILD_DIR)/src/Kyoto/IObj.o\