Compare commits

..

5 Commits

Author SHA1 Message Date
coah
dda2484afb cleanup(tiInputForm): name pane/string labels
Rename known layout pane name placeholders; leave float
constants and unused N_KOR/N_CHN sdata decls for follow-ups.
2026-10-01 18:08:16 -05:00
coah
dd3cd80d9b match(CDBDatabase): decompile CDBDatabasePrivateCreateRecordAtOnceEx_ (#619)
Exact match (73/73, diffs 0). DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.

Co-authored-by: asm2c <asm2c@local>
2026-10-01 18:08:05 -05:00
github-actions[bot]
3cbe527d23 docs: update progress [skip ci] 2026-10-01 23:07:39 +00:00
coah
3ab6d87c3d cleanup(CHANSVm): name string labels and VmCmpEq bVar (#618)
Rename UTF-16 / class-name / printf / hex placeholders and
CHANSVmConstStringObject* companions; bVar1 → stringsMatch.
2026-10-01 18:07:38 -05:00
coah
40653c3c02 Link iqdec_b65_frv32 via retail .s (#615)
NonMatching/Equivalent source does not keep DOL SHA1. Assemble extracted unit and mark Matching.

Also fix --defsym VERSION_* for gas (needs =1).

Linked code: 62.047% -> 62.084% / 919 units
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d

Co-authored-by: linker <linker@local>
2026-10-01 18:06:29 -05:00
8 changed files with 460 additions and 192 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.84% | 62.33% | 92.06% |
| 99.37% | 87.87% | 62.36% | 92.06% |
units 919/1027 complete, functions 12220/12563 matched.
units 920/1027 complete, functions 12221/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -13990,13 +13990,13 @@ scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
lbl_81616C98 = .rodata:0x81616C98; // type:object size:0x10
lbl_81616CA8 = .rodata:0x81616CA8; // type:object size:0x10
lbl_81616CB8 = .rodata:0x81616CB8; // type:object size:0x10 data:4byte
CHANSVmConstStringObjectNaN = .rodata:0x81616C88; // type:object size:0x10
CHANSVmConstStringObjectInfinity = .rodata:0x81616C98; // type:object size:0x10
CHANSVmConstStringObjectMinusInfinity = .rodata:0x81616CA8; // type:object size:0x10
CHANSVmConstStringObjectComma = .rodata:0x81616CB8; // type:object size:0x10 data:4byte
CHANSVmConstStringDataEmpty = .rodata:0x81616CC8; // type:object size:0x10
CHANSVmConstStringObjectUndefined_ = .rodata:0x81616CD8; // type:object size:0x50
lbl_81616D28 = .rodata:0x81616D28; // type:object size:0x20
scFloatConstantList = .rodata:0x81616D28; // type:object size:0x20
VmTypeConvertFuncTbl = .rodata:0x81616D48; // type:object size:0x90
VmResultTypeTbl = .rodata:0x81616DD8; // type:object size:0xB4
VmArrayPropertyTbl = .rodata:0x81616E8C; // type:object size:0xC data:4byte
@@ -17456,19 +17456,19 @@ __vt__Q49textinput8keyboard13cellphonetype23CellPhoneControlAnmPane = .data:0x81
__vt__Q49textinput8keyboard13cellphonetype16CellPhoneAnmPane = .data:0x8165C730; // type:object size:0x28
__vt__Q49textinput8keyboard13cellphonetype12EventHandler = .data:0x8165C758; // type:object size:0x20
__vt__Q49textinput8keyboard13cellphonetype4Base = .data:0x8165C778; // type:object size:0xA8
lbl_8165C820 = .data:0x8165C820; // type:object size:0xE data:string
lbl_8165C830 = .data:0x8165C830; // type:object size:0x10 data:string
scP_txtScrll_UP = .data:0x8165C820; // type:object size:0xE data:string
scP_txtScrll_DOWN = .data:0x8165C830; // type:object size:0x10 data:string
lbl_8165C840 = .data:0x8165C840; // type:object size:0x80
lbl_8165C8C0 = .data:0x8165C8C0; // type:object size:0xC data:string
lbl_8165C8CC = .data:0x8165C8CC; // type:object size:0x11 data:string
lbl_8165C8E0 = .data:0x8165C8E0; // type:object size:0xD data:string
lbl_8165C8F0 = .data:0x8165C8F0; // type:object size:0x10 data:string
lbl_8165C900 = .data:0x8165C900; // type:object size:0x11 data:string
lbl_8165C918 = .data:0x8165C918; // type:object size:0x10 data:string
lbl_8165C928 = .data:0x8165C928; // type:object size:0x10 data:string
lbl_8165C938 = .data:0x8165C938; // type:object size:0x11 data:string
lbl_8165C950 = .data:0x8165C950; // type:object size:0x10 data:string
lbl_8165C960 = .data:0x8165C960; // type:object size:0x10 data:string
scN_JPNUSAEUR = .data:0x8165C8C0; // type:object size:0xC data:string
scN_separateBarAll = .data:0x8165C8CC; // type:object size:0x11 data:string
scT_2l_TextBox = .data:0x8165C8E0; // type:object size:0xD data:string
scT_title_textJPN = .data:0x8165C8F0; // type:object size:0x10 data:string
scN_separateBarKOR = .data:0x8165C900; // type:object size:0x11 data:string
scT_2l_TextBoxKOR = .data:0x8165C918; // type:object size:0x10 data:string
scT_title_textKOR = .data:0x8165C928; // type:object size:0x10 data:string
scN_separateBarCHN = .data:0x8165C938; // type:object size:0x11 data:string
scT_2l_TextBoxCHN = .data:0x8165C950; // type:object size:0x10 data:string
scT_title_textCHN = .data:0x8165C960; // type:object size:0x10 data:string
lbl_8165C970 = .data:0x8165C970; // type:object size:0x20 data:2byte
jumptable_8165C990 = .data:0x8165C990; // type:object size:0xA0 scope:local
jumptable_8165CA30 = .data:0x8165CA30; // type:object size:0x28 scope:local
@@ -17942,16 +17942,16 @@ jumptable_81668EF8 = .data:0x81668EF8; // type:object size:0xFC scope:local
__vt__Q49textinput8keyboard5hwkey10HWKeyboard = .data:0x81668FF4; // type:object size:0x24
__vt__Q29textinput8TiLayout = .data:0x81669018; // type:object size:0x34
__vt__Q29textinput17AnimTransformPane = .data:0x81669050; // type:object size:0x20
lbl_81669070 = .data:0x81669070; // type:object size:0x13
lbl_81669083 = .data:0x81669083; // type:object size:0x11
lbl_81669094 = .data:0x81669094; // type:object size:0x13
scUndefinedUtf16 = .data:0x81669070; // type:object size:0x13
scInfinityUtf16 = .data:0x81669083; // type:object size:0x11
scMinusInfinityUtf16 = .data:0x81669094; // type:object size:0x13
lbl_816690A7 = .data:0x816690A7; // type:object size:0x9 data:string
lbl_816690B0 = .data:0x816690B0; // type:object size:0xA data:string
lbl_816690BA = .data:0x816690BA; // type:object size:0xA data:string
lbl_816690C4 = .data:0x816690C4; // type:object size:0x1E data:string
lbl_816690E2 = .data:0x816690E2; // type:object size:0x1B data:string
jumptable_81669100 = .data:0x81669100; // type:object size:0x28 scope:local
lbl_81669128 = .data:0x81669128; // type:object size:0x10 data:string
scVmGetResultType = .data:0x81669128; // type:object size:0x10 data:string
jumptable_81669138 = .data:0x81669138; // type:object size:0x24 scope:local
jumptable_8166915C = .data:0x8166915C; // type:object size:0x24 scope:local
jumptable_81669180 = .data:0x81669180; // type:object size:0x28 scope:local
@@ -18055,7 +18055,7 @@ lbl_81669DC3 = .data:0x81669DC3; // type:object size:0xE data:string
lbl_81669DD1 = .data:0x81669DD1; // type:object size:0xC data:string
lbl_81669DDD = .data:0x81669DDD; // type:object size:0xC data:string
lbl_81669DE9 = .data:0x81669DE9; // type:object size:0xC data:string
lbl_81669DF5 = .data:0x81669DF5; // type:object size:0x11 data:string
scHexDigits = .data:0x81669DF5; // type:object size:0x11 data:string
vmBlobPackFormatList = .data:0x81669E08; // type:object size:0x190 scope:local data:4byte
lbl_81669F98 = .data:0x81669F98; // type:object size:0xA data:string
lbl_81669FA2 = .data:0x81669FA2; // type:object size:0xA data:string
@@ -22347,7 +22347,7 @@ lbl_8169757F = .sdata:0x8169757F; // type:object size:0x3
lbl_81697582 = .sdata:0x81697582; // type:object size:0x1
lbl_81697583 = .sdata:0x81697583; // type:object size:0x3 data:string
lbl_81697586 = .sdata:0x81697586; // type:object size:0x4 data:string
lbl_8169758A = .sdata:0x8169758A; // type:object size:0x7 data:string
scFloatPrintfFmt = .sdata:0x8169758A; // type:object size:0x7 data:string
lbl_81697591 = .sdata:0x81697591; // type:object size:0x5 data:string
lbl_81697596 = .sdata:0x81697596; // type:object size:0x7 data:string
lbl_8169759D = .sdata:0x8169759D; // type:object size:0x5 data:string
@@ -22413,8 +22413,8 @@ lbl_816976C4 = .sdata:0x816976C4; // type:object size:0x8 data:string
lbl_816976CC = .sdata:0x816976CC; // type:object size:0x8 data:string
lbl_816976D4 = .sdata:0x816976D4; // type:object size:0x7 data:string
lbl_816976DB = .sdata:0x816976DB; // type:object size:0x6 data:string
lbl_816976E4 = .sdata:0x816976E4; // type:object size:0x4 data:4byte
lbl_816976E8 = .sdata:0x816976E8; // type:object size:0x4 data:4byte
scHexDigitsPtr = .sdata:0x816976E4; // type:object size:0x4 data:4byte
scHexDigitsPtr2 = .sdata:0x816976E8; // type:object size:0x4 data:4byte
lbl_816976EC = .sdata:0x816976EC; // type:object size:0x7 data:string
lbl_816976F3 = .sdata:0x816976F3; // type:object size:0x8 data:string
lbl_816976FB = .sdata:0x816976FB; // type:object size:0x5 data:string
@@ -22439,15 +22439,15 @@ lbl_81697770 = .sdata:0x81697770; // type:object size:0x8 data:string
lbl_81697778 = .sdata:0x81697778; // type:object size:0x8 data:string
lbl_81697780 = .sdata:0x81697780; // type:object size:0x5 data:string
lbl_81697785 = .sdata:0x81697785; // type:object size:0x7 data:string
lbl_8169778C = .sdata:0x8169778C; // type:object size:0x6 data:string
scImageClassName = .sdata:0x8169778C; // type:object size:0x6 data:string
lbl_81697792 = .sdata:0x81697792; // type:object size:0x6 data:string
lbl_81697798 = .sdata:0x81697798; // type:object size:0x7 data:string
lbl_8169779F = .sdata:0x8169779F; // type:object size:0x7 data:string
lbl_816977A6 = .sdata:0x816977A6; // type:object size:0x6 data:string
lbl_816977AC = .sdata:0x816977AC; // type:object size:0x5 data:string
lbl_816977B1 = .sdata:0x816977B1; // type:object size:0x6 data:string
lbl_816977B7 = .sdata:0x816977B7; // type:object size:0x5 data:string
lbl_816977BC = .sdata:0x816977BC; // type:object size:0x8 data:string
scDateClassName = .sdata:0x816977AC; // type:object size:0x5 data:string
scMathInternalName = .sdata:0x816977B1; // type:object size:0x6 data:string
scMathClassName = .sdata:0x816977B7; // type:object size:0x5 data:string
scWinEmuInternalName = .sdata:0x816977BC; // type:object size:0x8 data:string
lbl_816977C4 = .sdata:0x816977C4; // type:object size:0x5 data:string
lbl_816977D0 = .sdata:0x816977D0; // type:object size:0x5 data:string
lbl_816977D5 = .sdata:0x816977D5; // type:object size:0x8 data:string

View File

@@ -247,7 +247,7 @@ config.asflags = [
"-I include",
f"-I build/{config.version}/include",
f"--defsym BUILD_VERSION={version_num}",
f"--defsym VERSION_{config.version}",
f"--defsym VERSION_{config.version}=1",
]
config.ldflags = [
"-fp hardware",
@@ -1218,7 +1218,7 @@ config.libs = [
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
Object(NonMatching, "texturecvtr/Texture_MCUtoRGBA8.c"),
Object(NonMatching, "b65/iqdec_b65_frv32.c"),
Object(Matching, "b65/iqdec_b65_frv32.c", source="b65/iqdec_b65_frv32.s"),
]
),
# NW4R

View File

@@ -1,3 +1,4 @@
// Matching build uses iqdec_b65_frv32.s (retail extract); keep C for reference.
#include <string.h>
#include <tmc_jpeg_internal.h>

View File

@@ -0,0 +1,315 @@
.include "macros.inc"
.file "iqdec_b65_frv32.c"
# 0x814F6BD4..0x814F7024 | size: 0x450
.text
.balign 4
# .text:0x0 | 0x814F6BD4 | size: 0x450
.fn TMCJPEGDEC_decode_iquant, global
/* 814F6BD4 001C70F4 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 814F6BD8 001C70F8 7C 08 02 A6 */ mflr r0
/* 814F6BDC 001C70FC 90 01 00 54 */ stw r0, 0x54(r1)
/* 814F6BE0 001C7100 BE A1 00 24 */ stmw r21, 0x24(r1)
/* 814F6BE4 001C7104 7C 75 1B 78 */ mr r21, r3
/* 814F6BE8 001C7108 7C 96 23 78 */ mr r22, r4
/* 814F6BEC 001C710C 7C B8 2B 78 */ mr r24, r5
/* 814F6BF0 001C7110 7C D7 33 78 */ mr r23, r6
/* 814F6BF4 001C7114 80 06 00 04 */ lwz r0, 0x4(r6)
/* 814F6BF8 001C7118 83 26 04 98 */ lwz r25, 0x498(r6)
/* 814F6BFC 001C711C 2C 00 00 08 */ cmpwi r0, 0x8
/* 814F6C00 001C7120 41 81 00 18 */ bgt .L_814F6C18
/* 814F6C04 001C7124 7E E3 BB 78 */ mr r3, r23
/* 814F6C08 001C7128 4B FF 42 05 */ bl TMCJPEGDEC_load_buff
/* 814F6C0C 001C712C 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6C10 001C7130 40 80 00 08 */ bge .L_814F6C18
/* 814F6C14 001C7134 48 00 03 FC */ b .L_814F7010
.L_814F6C18:
/* 814F6C18 001C7138 80 97 00 04 */ lwz r4, 0x4(r23)
/* 814F6C1C 001C713C 80 77 00 00 */ lwz r3, 0x0(r23)
/* 814F6C20 001C7140 38 04 FF F8 */ subi r0, r4, 0x8
/* 814F6C24 001C7144 7C 60 04 30 */ srw r0, r3, r0
/* 814F6C28 001C7148 54 00 15 BA */ clrlslwi r0, r0, 24, 2
/* 814F6C2C 001C714C 7C 79 02 14 */ add r3, r25, r0
/* 814F6C30 001C7150 7C 19 02 2E */ lhzx r0, r25, r0
/* 814F6C34 001C7154 A3 23 00 02 */ lhz r25, 0x2(r3)
/* 814F6C38 001C7158 2C 00 00 00 */ cmpwi r0, 0x0
/* 814F6C3C 001C715C B0 01 00 1C */ sth r0, 0x1c(r1)
/* 814F6C40 001C7160 B3 21 00 1E */ sth r25, 0x1e(r1)
/* 814F6C44 001C7164 41 82 00 10 */ beq .L_814F6C54
/* 814F6C48 001C7168 7C 00 20 50 */ subf r0, r0, r4
/* 814F6C4C 001C716C 90 17 00 04 */ stw r0, 0x4(r23)
/* 814F6C50 001C7170 48 00 00 C8 */ b .L_814F6D18
.L_814F6C54:
/* 814F6C54 001C7174 2C 04 00 11 */ cmpwi r4, 0x11
/* 814F6C58 001C7178 83 B7 04 A0 */ lwz r29, 0x4a0(r23)
/* 814F6C5C 001C717C 83 37 04 9C */ lwz r25, 0x49c(r23)
/* 814F6C60 001C7180 41 81 00 18 */ bgt .L_814F6C78
/* 814F6C64 001C7184 7E E3 BB 78 */ mr r3, r23
/* 814F6C68 001C7188 4B FF 41 A5 */ bl TMCJPEGDEC_load_buff
/* 814F6C6C 001C718C 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6C70 001C7190 40 80 00 08 */ bge .L_814F6C78
/* 814F6C74 001C7194 48 00 00 94 */ b .L_814F6D08
.L_814F6C78:
/* 814F6C78 001C7198 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6C7C 001C719C 38 F9 00 24 */ addi r7, r25, 0x24
/* 814F6C80 001C71A0 80 17 00 00 */ lwz r0, 0x0(r23)
/* 814F6C84 001C71A4 38 A0 00 09 */ li r5, 0x9
/* 814F6C88 001C71A8 38 63 FF F7 */ subi r3, r3, 0x9
/* 814F6C8C 001C71AC 7C 00 1C 30 */ srw r0, r0, r3
/* 814F6C90 001C71B0 90 77 00 04 */ stw r3, 0x4(r23)
/* 814F6C94 001C71B4 54 06 05 FE */ clrlwi r6, r0, 23
/* 814F6C98 001C71B8 48 00 00 3C */ b .L_814F6CD4
.L_814F6C9C:
/* 814F6C9C 001C71BC 38 A5 00 01 */ addi r5, r5, 0x1
/* 814F6CA0 001C71C0 38 E7 00 04 */ addi r7, r7, 0x4
/* 814F6CA4 001C71C4 28 05 00 10 */ cmplwi r5, 0x10
/* 814F6CA8 001C71C8 40 81 00 0C */ ble .L_814F6CB4
/* 814F6CAC 001C71CC 38 60 FF 9C */ li r3, -0x64
/* 814F6CB0 001C71D0 48 00 00 58 */ b .L_814F6D08
.L_814F6CB4:
/* 814F6CB4 001C71D4 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6CB8 001C71D8 54 C6 08 3C */ slwi r6, r6, 1
/* 814F6CBC 001C71DC 80 17 00 00 */ lwz r0, 0x0(r23)
/* 814F6CC0 001C71E0 38 63 FF FF */ subi r3, r3, 0x1
/* 814F6CC4 001C71E4 7C 00 1C 30 */ srw r0, r0, r3
/* 814F6CC8 001C71E8 90 77 00 04 */ stw r3, 0x4(r23)
/* 814F6CCC 001C71EC 54 00 07 FE */ clrlwi r0, r0, 31
/* 814F6CD0 001C71F0 7C C6 03 78 */ or r6, r6, r0
.L_814F6CD4:
/* 814F6CD4 001C71F4 A0 87 00 00 */ lhz r4, 0x0(r7)
/* 814F6CD8 001C71F8 A0 67 00 02 */ lhz r3, 0x2(r7)
/* 814F6CDC 001C71FC B0 81 00 14 */ sth r4, 0x14(r1)
/* 814F6CE0 001C7200 B0 61 00 16 */ sth r3, 0x16(r1)
/* 814F6CE4 001C7204 80 01 00 14 */ lwz r0, 0x14(r1)
/* 814F6CE8 001C7208 90 01 00 18 */ stw r0, 0x18(r1)
/* 814F6CEC 001C720C A0 01 00 18 */ lhz r0, 0x18(r1)
/* 814F6CF0 001C7210 7C 06 00 40 */ cmplw r6, r0
/* 814F6CF4 001C7214 41 81 FF A8 */ bgt .L_814F6C9C
/* 814F6CF8 001C7218 7C 04 30 50 */ subf r0, r4, r6
/* 814F6CFC 001C721C 7C 00 1A 14 */ add r0, r0, r3
/* 814F6D00 001C7220 54 00 06 3E */ clrlwi r0, r0, 24
/* 814F6D04 001C7224 7C 7D 00 AE */ lbzx r3, r29, r0
.L_814F6D08:
/* 814F6D08 001C7228 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6D0C 001C722C 7C 79 1B 78 */ mr r25, r3
/* 814F6D10 001C7230 40 80 00 08 */ bge .L_814F6D18
/* 814F6D14 001C7234 48 00 02 FC */ b .L_814F7010
.L_814F6D18:
/* 814F6D18 001C7238 2C 19 00 00 */ cmpwi r25, 0x0
/* 814F6D1C 001C723C 83 76 00 00 */ lwz r27, 0x0(r22)
/* 814F6D20 001C7240 41 82 00 64 */ beq .L_814F6D84
/* 814F6D24 001C7244 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6D28 001C7248 7C 00 C8 00 */ cmpw r0, r25
/* 814F6D2C 001C724C 41 81 00 18 */ bgt .L_814F6D44
/* 814F6D30 001C7250 7E E3 BB 78 */ mr r3, r23
/* 814F6D34 001C7254 4B FF 40 D9 */ bl TMCJPEGDEC_load_buff
/* 814F6D38 001C7258 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6D3C 001C725C 40 80 00 08 */ bge .L_814F6D44
/* 814F6D40 001C7260 48 00 02 D0 */ b .L_814F7010
.L_814F6D44:
/* 814F6D44 001C7264 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6D48 001C7268 38 80 00 01 */ li r4, 0x1
/* 814F6D4C 001C726C 80 77 00 00 */ lwz r3, 0x0(r23)
/* 814F6D50 001C7270 7C 86 C8 30 */ slw r6, r4, r25
/* 814F6D54 001C7274 7C 99 00 50 */ subf r4, r25, r0
/* 814F6D58 001C7278 38 A6 FF FF */ subi r5, r6, 0x1
/* 814F6D5C 001C727C 7C C0 0E 70 */ srawi r0, r6, 1
/* 814F6D60 001C7280 7C 63 24 30 */ srw r3, r3, r4
/* 814F6D64 001C7284 90 97 00 04 */ stw r4, 0x4(r23)
/* 814F6D68 001C7288 7C A3 18 38 */ and r3, r5, r3
/* 814F6D6C 001C728C 7C 00 18 00 */ cmpw r0, r3
/* 814F6D70 001C7290 40 81 00 08 */ ble .L_814F6D78
/* 814F6D74 001C7294 7C 65 18 50 */ subf r3, r5, r3
.L_814F6D78:
/* 814F6D78 001C7298 80 18 00 00 */ lwz r0, 0x0(r24)
/* 814F6D7C 001C729C 7C 00 1A 14 */ add r0, r0, r3
/* 814F6D80 001C72A0 90 18 00 00 */ stw r0, 0x0(r24)
.L_814F6D84:
/* 814F6D84 001C72A4 80 18 00 00 */ lwz r0, 0x0(r24)
/* 814F6D88 001C72A8 38 75 00 04 */ addi r3, r21, 0x4
/* 814F6D8C 001C72AC 38 80 00 00 */ li r4, 0x0
/* 814F6D90 001C72B0 38 A0 00 FC */ li r5, 0xfc
/* 814F6D94 001C72B4 7C 00 D9 D6 */ mullw r0, r0, r27
/* 814F6D98 001C72B8 90 15 00 00 */ stw r0, 0x0(r21)
/* 814F6D9C 001C72BC 83 97 04 A8 */ lwz r28, 0x4a8(r23)
/* 814F6DA0 001C72C0 83 37 04 AC */ lwz r25, 0x4ac(r23)
/* 814F6DA4 001C72C4 83 17 04 B0 */ lwz r24, 0x4b0(r23)
/* 814F6DA8 001C72C8 4B E3 95 8D */ bl memset
/* 814F6DAC 001C72CC 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6DB0 001C72D0 3B 60 00 01 */ li r27, 0x1
/* 814F6DB4 001C72D4 2C 00 00 08 */ cmpwi r0, 0x8
/* 814F6DB8 001C72D8 41 81 00 18 */ bgt .L_814F6DD0
/* 814F6DBC 001C72DC 7E E3 BB 78 */ mr r3, r23
/* 814F6DC0 001C72E0 4B FF 40 4D */ bl TMCJPEGDEC_load_buff
/* 814F6DC4 001C72E4 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6DC8 001C72E8 40 80 00 08 */ bge .L_814F6DD0
/* 814F6DCC 001C72EC 48 00 02 44 */ b .L_814F7010
.L_814F6DD0:
/* 814F6DD0 001C72F0 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6DD4 001C72F4 3F A0 81 62 */ lis r29, TMCJPEGDEC_Zigzag_data@ha
/* 814F6DD8 001C72F8 80 97 00 00 */ lwz r4, 0x0(r23)
/* 814F6DDC 001C72FC 3B BD E1 B0 */ addi r29, r29, TMCJPEGDEC_Zigzag_data@l
/* 814F6DE0 001C7300 38 03 FF F8 */ subi r0, r3, 0x8
/* 814F6DE4 001C7304 3B E0 00 01 */ li r31, 0x1
/* 814F6DE8 001C7308 7C 80 04 30 */ srw r0, r4, r0
/* 814F6DEC 001C730C 54 00 15 BA */ clrlslwi r0, r0, 24, 2
/* 814F6DF0 001C7310 7C 9C 02 14 */ add r4, r28, r0
/* 814F6DF4 001C7314 7C 7C 02 2E */ lhzx r3, r28, r0
/* 814F6DF8 001C7318 A0 04 00 02 */ lhz r0, 0x2(r4)
/* 814F6DFC 001C731C B0 61 00 08 */ sth r3, 0x8(r1)
/* 814F6E00 001C7320 B0 01 00 0A */ sth r0, 0xa(r1)
.L_814F6E04:
/* 814F6E04 001C7324 A0 81 00 08 */ lhz r4, 0x8(r1)
/* 814F6E08 001C7328 2C 04 00 00 */ cmpwi r4, 0x0
/* 814F6E0C 001C732C 41 82 00 18 */ beq .L_814F6E24
/* 814F6E10 001C7330 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6E14 001C7334 A0 61 00 0A */ lhz r3, 0xa(r1)
/* 814F6E18 001C7338 7C 04 00 50 */ subf r0, r4, r0
/* 814F6E1C 001C733C 90 17 00 04 */ stw r0, 0x4(r23)
/* 814F6E20 001C7340 48 00 00 C0 */ b .L_814F6EE0
.L_814F6E24:
/* 814F6E24 001C7344 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6E28 001C7348 2C 00 00 11 */ cmpwi r0, 0x11
/* 814F6E2C 001C734C 41 81 00 18 */ bgt .L_814F6E44
/* 814F6E30 001C7350 7E E3 BB 78 */ mr r3, r23
/* 814F6E34 001C7354 4B FF 3F D9 */ bl TMCJPEGDEC_load_buff
/* 814F6E38 001C7358 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6E3C 001C735C 40 80 00 08 */ bge .L_814F6E44
/* 814F6E40 001C7360 48 00 00 94 */ b .L_814F6ED4
.L_814F6E44:
/* 814F6E44 001C7364 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6E48 001C7368 38 F9 00 24 */ addi r7, r25, 0x24
/* 814F6E4C 001C736C 80 17 00 00 */ lwz r0, 0x0(r23)
/* 814F6E50 001C7370 38 A0 00 09 */ li r5, 0x9
/* 814F6E54 001C7374 38 63 FF F7 */ subi r3, r3, 0x9
/* 814F6E58 001C7378 7C 00 1C 30 */ srw r0, r0, r3
/* 814F6E5C 001C737C 90 77 00 04 */ stw r3, 0x4(r23)
/* 814F6E60 001C7380 54 06 05 FE */ clrlwi r6, r0, 23
/* 814F6E64 001C7384 48 00 00 3C */ b .L_814F6EA0
.L_814F6E68:
/* 814F6E68 001C7388 38 A5 00 01 */ addi r5, r5, 0x1
/* 814F6E6C 001C738C 38 E7 00 04 */ addi r7, r7, 0x4
/* 814F6E70 001C7390 28 05 00 10 */ cmplwi r5, 0x10
/* 814F6E74 001C7394 40 81 00 0C */ ble .L_814F6E80
/* 814F6E78 001C7398 38 60 FF 9C */ li r3, -0x64
/* 814F6E7C 001C739C 48 00 00 58 */ b .L_814F6ED4
.L_814F6E80:
/* 814F6E80 001C73A0 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6E84 001C73A4 54 C6 08 3C */ slwi r6, r6, 1
/* 814F6E88 001C73A8 80 17 00 00 */ lwz r0, 0x0(r23)
/* 814F6E8C 001C73AC 38 63 FF FF */ subi r3, r3, 0x1
/* 814F6E90 001C73B0 7C 00 1C 30 */ srw r0, r0, r3
/* 814F6E94 001C73B4 90 77 00 04 */ stw r3, 0x4(r23)
/* 814F6E98 001C73B8 54 00 07 FE */ clrlwi r0, r0, 31
/* 814F6E9C 001C73BC 7C C6 03 78 */ or r6, r6, r0
.L_814F6EA0:
/* 814F6EA0 001C73C0 A0 87 00 00 */ lhz r4, 0x0(r7)
/* 814F6EA4 001C73C4 A0 67 00 02 */ lhz r3, 0x2(r7)
/* 814F6EA8 001C73C8 B0 81 00 0C */ sth r4, 0xc(r1)
/* 814F6EAC 001C73CC B0 61 00 0E */ sth r3, 0xe(r1)
/* 814F6EB0 001C73D0 80 01 00 0C */ lwz r0, 0xc(r1)
/* 814F6EB4 001C73D4 90 01 00 10 */ stw r0, 0x10(r1)
/* 814F6EB8 001C73D8 A0 01 00 10 */ lhz r0, 0x10(r1)
/* 814F6EBC 001C73DC 7C 06 00 40 */ cmplw r6, r0
/* 814F6EC0 001C73E0 41 81 FF A8 */ bgt .L_814F6E68
/* 814F6EC4 001C73E4 7C 04 30 50 */ subf r0, r4, r6
/* 814F6EC8 001C73E8 7C 00 1A 14 */ add r0, r0, r3
/* 814F6ECC 001C73EC 54 00 06 3E */ clrlwi r0, r0, 24
/* 814F6ED0 001C73F0 7C 78 00 AE */ lbzx r3, r24, r0
.L_814F6ED4:
/* 814F6ED4 001C73F4 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6ED8 001C73F8 40 80 00 08 */ bge .L_814F6EE0
/* 814F6EDC 001C73FC 48 00 01 34 */ b .L_814F7010
.L_814F6EE0:
/* 814F6EE0 001C7400 54 7A 07 3F */ clrlwi. r26, r3, 28
/* 814F6EE4 001C7404 41 82 00 AC */ beq .L_814F6F90
/* 814F6EE8 001C7408 7C 60 26 70 */ srawi r0, r3, 4
/* 814F6EEC 001C740C 7F 7B 02 14 */ add r27, r27, r0
/* 814F6EF0 001C7410 2C 1B 00 40 */ cmpwi r27, 0x40
/* 814F6EF4 001C7414 41 80 00 0C */ blt .L_814F6F00
/* 814F6EF8 001C7418 38 60 FF 9C */ li r3, -0x64
/* 814F6EFC 001C741C 48 00 01 14 */ b .L_814F7010
.L_814F6F00:
/* 814F6F00 001C7420 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6F04 001C7424 38 1A 00 08 */ addi r0, r26, 0x8
/* 814F6F08 001C7428 7F DD D8 AE */ lbzx r30, r29, r27
/* 814F6F0C 001C742C 7C 03 00 00 */ cmpw r3, r0
/* 814F6F10 001C7430 41 81 00 18 */ bgt .L_814F6F28
/* 814F6F14 001C7434 7E E3 BB 78 */ mr r3, r23
/* 814F6F18 001C7438 4B FF 3E F5 */ bl TMCJPEGDEC_load_buff
/* 814F6F1C 001C743C 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6F20 001C7440 40 80 00 08 */ bge .L_814F6F28
/* 814F6F24 001C7444 48 00 00 EC */ b .L_814F7010
.L_814F6F28:
/* 814F6F28 001C7448 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6F2C 001C744C 7F E3 D0 30 */ slw r3, r31, r26
/* 814F6F30 001C7450 80 B7 00 00 */ lwz r5, 0x0(r23)
/* 814F6F34 001C7454 38 C3 FF FF */ subi r6, r3, 0x1
/* 814F6F38 001C7458 7C 9A 00 50 */ subf r4, r26, r0
/* 814F6F3C 001C745C 7C 60 0E 70 */ srawi r0, r3, 1
/* 814F6F40 001C7460 38 64 FF F8 */ subi r3, r4, 0x8
/* 814F6F44 001C7464 90 97 00 04 */ stw r4, 0x4(r23)
/* 814F6F48 001C7468 7C A3 1C 30 */ srw r3, r5, r3
/* 814F6F4C 001C746C 7C A5 24 30 */ srw r5, r5, r4
/* 814F6F50 001C7470 54 63 15 BA */ clrlslwi r3, r3, 24, 2
/* 814F6F54 001C7474 57 C7 15 BA */ clrlslwi r7, r30, 24, 2
/* 814F6F58 001C7478 7C 9C 1A 14 */ add r4, r28, r3
/* 814F6F5C 001C747C 7C C5 28 38 */ and r5, r6, r5
/* 814F6F60 001C7480 7C 7C 1A 2E */ lhzx r3, r28, r3
/* 814F6F64 001C7484 7C 00 28 00 */ cmpw r0, r5
/* 814F6F68 001C7488 A0 04 00 02 */ lhz r0, 0x2(r4)
/* 814F6F6C 001C748C B0 61 00 08 */ sth r3, 0x8(r1)
/* 814F6F70 001C7490 7C 76 38 2E */ lwzx r3, r22, r7
/* 814F6F74 001C7494 B0 01 00 0A */ sth r0, 0xa(r1)
/* 814F6F78 001C7498 40 81 00 08 */ ble .L_814F6F80
/* 814F6F7C 001C749C 7C A6 28 50 */ subf r5, r6, r5
.L_814F6F80:
/* 814F6F80 001C74A0 7C 05 19 D6 */ mullw r0, r5, r3
/* 814F6F84 001C74A4 3B 7B 00 01 */ addi r27, r27, 0x1
/* 814F6F88 001C74A8 7C 15 39 2E */ stwx r0, r21, r7
/* 814F6F8C 001C74AC 48 00 00 58 */ b .L_814F6FE4
.L_814F6F90:
/* 814F6F90 001C74B0 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6F94 001C74B4 41 82 00 58 */ beq .L_814F6FEC
/* 814F6F98 001C74B8 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6F9C 001C74BC 2C 00 00 08 */ cmpwi r0, 0x8
/* 814F6FA0 001C74C0 41 81 00 18 */ bgt .L_814F6FB8
/* 814F6FA4 001C74C4 7E E3 BB 78 */ mr r3, r23
/* 814F6FA8 001C74C8 4B FF 3E 65 */ bl TMCJPEGDEC_load_buff
/* 814F6FAC 001C74CC 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6FB0 001C74D0 40 80 00 08 */ bge .L_814F6FB8
/* 814F6FB4 001C74D4 48 00 00 5C */ b .L_814F7010
.L_814F6FB8:
/* 814F6FB8 001C74D8 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6FBC 001C74DC 3B 7B 00 10 */ addi r27, r27, 0x10
/* 814F6FC0 001C74E0 80 97 00 00 */ lwz r4, 0x0(r23)
/* 814F6FC4 001C74E4 38 03 FF F8 */ subi r0, r3, 0x8
/* 814F6FC8 001C74E8 7C 80 04 30 */ srw r0, r4, r0
/* 814F6FCC 001C74EC 54 00 15 BA */ clrlslwi r0, r0, 24, 2
/* 814F6FD0 001C74F0 7C 9C 02 14 */ add r4, r28, r0
/* 814F6FD4 001C74F4 7C 7C 02 2E */ lhzx r3, r28, r0
/* 814F6FD8 001C74F8 A0 04 00 02 */ lhz r0, 0x2(r4)
/* 814F6FDC 001C74FC B0 61 00 08 */ sth r3, 0x8(r1)
/* 814F6FE0 001C7500 B0 01 00 0A */ sth r0, 0xa(r1)
.L_814F6FE4:
/* 814F6FE4 001C7504 2C 1B 00 40 */ cmpwi r27, 0x40
/* 814F6FE8 001C7508 41 80 FE 1C */ blt .L_814F6E04
.L_814F6FEC:
/* 814F6FEC 001C750C 2C 1B 00 40 */ cmpwi r27, 0x40
/* 814F6FF0 001C7510 40 81 00 0C */ ble .L_814F6FFC
/* 814F6FF4 001C7514 38 60 FF 9C */ li r3, -0x64
/* 814F6FF8 001C7518 48 00 00 18 */ b .L_814F7010
.L_814F6FFC:
/* 814F6FFC 001C751C 38 1B FF FF */ subi r0, r27, 0x1
/* 814F7000 001C7520 3C 60 81 62 */ lis r3, TMCJPEGDEC_Zigzag_loop@ha
/* 814F7004 001C7524 54 00 10 3A */ slwi r0, r0, 2
/* 814F7008 001C7528 38 63 E1 F0 */ addi r3, r3, TMCJPEGDEC_Zigzag_loop@l
/* 814F700C 001C752C 7C 63 00 2E */ lwzx r3, r3, r0
.L_814F7010:
/* 814F7010 001C7530 BA A1 00 24 */ lmw r21, 0x24(r1)
/* 814F7014 001C7534 80 01 00 54 */ lwz r0, 0x54(r1)
/* 814F7018 001C7538 7C 08 03 A6 */ mtlr r0
/* 814F701C 001C753C 38 21 00 50 */ addi r1, r1, 0x50
/* 814F7020 001C7540 4E 80 00 20 */ blr
.endfn TMCJPEGDEC_decode_iquant

View File

@@ -94,7 +94,7 @@ extern CDBErr CDBDatabasePrivateCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode);
extern CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize);
extern CDBErr CDBDatabaseFindByKey();
typedef struct {
@@ -281,86 +281,38 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord*
return result;
}
asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x80(r1)
mflr r0
stw r0, 0x84(r1)
addi r11, r1, 0x80
bl _savegpr_18
lwz r24, 0x9c(r1)
mr r28, r3
lwz r27, 0x88(r1)
mr r29, r4
lwz r26, 0x8c(r1)
mr r30, r5
lwz r22, 0x90(r1)
mr r31, r6
lwz r23, 0x94(r1)
mr r18, r7
lwz r25, 0x98(r1)
mr r19, r8
mr r20, r9
mr r21, r10
mr r3, r24
bl CDBIsGameCodeStr
cmpwi r3, 0x0
bne L_81487844
li r3, 0x4
b L_814878EC
L_81487844:
mr r3, r25
bl CDBIsMakerCodeStr
cmpwi r3, 0x0
bne L_8148785C
li r3, 0x3
b L_814878EC
L_8148785C:
mr r3, r25
addi r4, r1, 0x10
bl CDBConvMCStrToMCValue
mr r3, r24
addi r4, r1, 0x14
bl CDBConvGCStrToGCValue
li r0, 0x0
stw r18, 0x2c(r1)
addi r3, r1, 0x18
stw r19, 0x28(r1)
stw r20, 0x24(r1)
stw r21, 0x20(r1)
stw r27, 0x1c(r1)
stw r26, 0x18(r1)
stw r0, 0x38(r1)
stw r0, 0x3c(r1)
bl OSCalendarTimeToTicks
lhz r26, 0x10(r1)
mr r24, r4
lwz r27, 0x14(r1)
mr r25, r3
bl CDBLock
stw r22, 0x8(r1)
mr r3, r28
mr r4, r29
mr r5, r30
stw r23, 0xc(r1)
mr r6, r31
mr r8, r24
mr r7, r25
mr r9, r27
mr r10, r26
bl CDBDatabaseCreateRecordImAtOnce_
mr r26, r3
bl CDBUnlock
mr r3, r26
L_814878EC:
addi r11, r1, 0x80
bl _restgpr_18
lwz r0, 0x84(r1)
mtlr r0
addi r1, r1, 0x80
blr
#endif
CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode) {
u32 gameCodeVal;
u32 gameValue;
u16 makerCodeVal;
u16 makerValue;
CDBErr result;
OSTime time;
OSCalendarTime cal;
if (!CDBIsGameCodeStr(gameCode)) {
return CDB_ERROR_4;
}
if (!CDBIsMakerCodeStr(makerCode)) {
return CDB_ERROR_3;
}
CDBConvMCStrToMCValue(makerCode, &makerValue);
CDBConvGCStrToGCValue(gameCode, &gameValue);
cal.year = year;
cal.mon = month;
cal.mday = day;
cal.hour = hour;
cal.min = min;
cal.sec = sec;
cal.msec = 0;
cal.usec = 0;
time = OSCalendarTimeToTicks(&cal);
makerCodeVal = makerValue;
gameCodeVal = gameValue;
CDBLock();
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCodeVal, makerCodeVal, recordData, recordDataSize);
CDBUnlock();
return result;
}
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {

View File

@@ -692,31 +692,31 @@ CHANSVmObjHdr* CHANSVm_8144B470(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
}
// The 16-bit strings use a single null byte for termination for some reason. Because of that, L"..." cannot be used.
u8 lbl_81669070[19] = {0x00, 'u', 0x00, 'n', 0x00, 'd', 0x00, 'e', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'e', 0x00, 'd', 0x00};
u8 lbl_81669083[17] = {0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 lbl_81669094[19] = {0x00, '-', 0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 scUndefinedUtf16[19] = {0x00, 'u', 0x00, 'n', 0x00, 'd', 0x00, 'e', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'e', 0x00, 'd', 0x00};
u8 scInfinityUtf16[17] = {0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 scMinusInfinityUtf16[19] = {0x00, '-', 0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
// clang-format off
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined = {{(wchar_t*)lbl_81669070, 18}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616C88 = {{(wchar_t*)"\0N\0a\0N", 6}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616C98 = {{(wchar_t*)lbl_81669083, 16}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616CA8 = {{(wchar_t*)lbl_81669094, 18}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616CB8 = {{(wchar_t*)"\0,", 2}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined = {{(wchar_t*)scUndefinedUtf16, 18}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectNaN = {{(wchar_t*)"\0N\0a\0N", 6}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectInfinity = {{(wchar_t*)scInfinityUtf16, 16}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectMinusInfinity = {{(wchar_t*)scMinusInfinityUtf16, 18}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectComma = {{(wchar_t*)"\0,", 2}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringDataEmpty = {{(wchar_t*)"", 0}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined_[] = {{{(void*)&CHANSVmConstStringObjectUndefined, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616C88, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616C98, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616CA8, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectNaN, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectInfinity, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectMinusInfinity, 0}, 0x03800100, vmNull},
{{vmNull, 0}, 0x00800000, vmNull}};
char VmReportFormat[] = "%s";
const CHANSVmFloatConstantList lbl_81616D28[] = {
const CHANSVmFloatConstantList scFloatConstantList[] = {
{ "Infinity", (double*)&VmInf },
{ "+Infinity", (double*)&VmInf },
{ "-Infinity", (double*)&VmMinusInf },
{ "NaN", (double*)&VmNaN }
};
char lbl_8169758A[] = "%.16lg";
char scFloatPrintfFmt[] = "%.16lg";
// clang-format on
static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
@@ -741,8 +741,8 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
*bufEnd = '\0';
for (i = 0; i < 4; i++) {
if (strcmp(buf, lbl_81616D28[i].spName) == 0) {
number = *lbl_81616D28[i].pValue;
if (strcmp(buf, scFloatConstantList[i].spName) == 0) {
number = *scFloatConstantList[i].pValue;
goto store;
}
}
@@ -786,7 +786,7 @@ CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type
}
s32 CHANSVm_8144B62C(vmWString buf, u32 len, vmFloat val) NO_INLINE {
s32 result = snprintf((char*)buf, len / 2, lbl_8169758A, val);
s32 result = snprintf((char*)buf, len / 2, scFloatPrintfFmt, val);
CHANSVmStrCpyToU16FromU8(buf, (vmString)buf, result);
return VM_STR_LENGTH(result);
}
@@ -899,7 +899,7 @@ vmBoolInt CHANSVmGetEnumedType(CHANSVmObjType* eType, vmU32 iType) NO_INLINE {
}
// TODO: Here was a function defined that was inlined into VmStep.
char lbl_81669128[] = "VmGetResultType";
char scVmGetResultType[] = "VmGetResultType";
// clang-format off
const VmConvertEntry VmTypeConvertFuncTbl[] = {
@@ -1254,7 +1254,7 @@ CHANSVmErr VmBitXor(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSV
}
CHANSVmErr VmCmpEq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSVmObjHdr* left, CHANSVmObjHdr* right) {
vmBoolInt bVar1;
vmBoolInt stringsMatch;
vmBoolInt isEqual;
CHANSVmErr err;
@@ -1287,11 +1287,11 @@ CHANSVmErr VmCmpEq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSVm
case CHANS_VM_OBJ_TYPE_STRING: {
isEqual = vmFalse;
if (left->value.string_v->len == right->value.string_v->len) {
bVar1 = vmFalse;
stringsMatch = vmFalse;
if (left->value.string_v->len == 0 || memcmp(*left->value.ptr_v, *right->value.ptr_v, left->value.string_v->len) == 0) {
bVar1 = vmTrue;
stringsMatch = vmTrue;
}
if (bVar1) {
if (stringsMatch) {
isEqual = vmTrue;
}
}
@@ -2225,7 +2225,7 @@ CHANSVmObjHdr* VmArrayJoinCommon(CHANSVm* vm, u32 retObjAddr, CHANSVmObjHdr* obj
u32 actualLen;
if (separatorAddr == 0) {
separatorAddr = *(u32*)&lbl_81616CB8;
separatorAddr = *(u32*)&CHANSVmConstStringObjectComma;
separatorLen = 2;
}
@@ -3790,9 +3790,9 @@ static void VmBlobInitValue(BlobHeader* blob, u32 size) {
static const char VmBlobClassName[] = "Blob";
char lbl_81669DF5[] = "0123456789abcdef";
char* lbl_816976E4 = lbl_81669DF5;
char* lbl_816976E8 = lbl_81669DF5;
char scHexDigits[] = "0123456789abcdef";
char* scHexDigitsPtr = scHexDigits;
char* scHexDigitsPtr2 = scHexDigits;
static CHANSVmObjHdr* VmBlobCreateDirect(CHANSVm* vm, CHANSVmObjHdr* obj, u32 size) NO_INLINE {
CHANSVmNativeClass* cls;
@@ -4292,7 +4292,7 @@ VmMethodDefine(Blob, GetHexString) {
u32 offset = blob->offset;
u32 destOff = 0;
u32 i = 0;
char* hexTbl = lbl_816976E4;
char* hexTbl = scHexDigitsPtr;
u32 loop_i;
src += offset;
@@ -5864,7 +5864,7 @@ VmMethodDefine(Blob, Unpack) {
u8* hexTable;
u8 byte;
u8 nibble;
hexTable = (u8*)lbl_816976E8;
hexTable = (u8*)scHexDigitsPtr2;
srcPos = srcData;
destPos = destStr;
@@ -5992,7 +5992,7 @@ void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSV
VmImageCtorCallback = ctorCb;
}
char lbl_8169778C[] = "Image";
char scImageClassName[] = "Image";
CHANSVmObjHdr* CHANSVmNewImageObject(CHANSVm* vm, CHANSVmObjHdr* object, vmPtr srcData, vmU16 width, vmU16 height, s32 format) {
u32 bpp;
@@ -6030,7 +6030,7 @@ CHANSVmObjHdr* CHANSVmNewImageObject(CHANSVm* vm, CHANSVmObjHdr* object, vmPtr s
if (object == vmNull) {
goto ret;
}
if (CHANSVmSetObjectAsNativeInstance(vm, object, vmNull, lbl_8169778C) != CHANS_VM_OK) {
if (CHANSVmSetObjectAsNativeInstance(vm, object, vmNull, scImageClassName) != CHANS_VM_OK) {
goto error;
}
image = (CHANSVmImage*)((u32*)object->value.ptr_v)[0];
@@ -6120,10 +6120,10 @@ static vmBoolInt VmWinEmuWrite(CHANSVm* vm, CHANSVmObjHdr* parent, CHANSVmObjHdr
const CHANSVmMethodList VmWinEmuMethodTbl[] = {"write", VmWinEmuWrite};
char lbl_816977AC[] = "Date";
char lbl_816977B1[] = "@Math";
char lbl_816977B7[] = "Math";
char lbl_816977BC[] = "@WinEmu";
char scDateClassName[] = "Date";
char scMathInternalName[] = "@Math";
char scMathClassName[] = "Math";
char scWinEmuInternalName[] = "@WinEmu";
static CHANSVmErr VmPushFuncReturnInfo(CHANSVm* vm, u32 argCount, u32 totalSlots, u32 headerCount);
@@ -6186,7 +6186,7 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
goto class_fail;
/* Date class */
cls = CHANSVmAddNativeClass2(vm, lbl_816977AC, VmDateCtor, 0, VmDateDtor);
cls = CHANSVmAddNativeClass2(vm, scDateClassName, VmDateCtor, 0, VmDateDtor);
if (cls == vmNull) {
ok = vmFalse;
} else {
@@ -6196,7 +6196,7 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
goto class_fail;
/* Math class */
if (CHANSVmNewBuiltinObject(vm, lbl_816977B1, vmNull, vmNull, vmNull, lbl_816977B7, vmNull, VmMathPropertyTbl, CHANSVmPropertyCount(VmMathPropertyTbl),
if (CHANSVmNewBuiltinObject(vm, scMathInternalName, vmNull, vmNull, vmNull, scMathClassName, vmNull, VmMathPropertyTbl, CHANSVmPropertyCount(VmMathPropertyTbl),
VmMathMethodTbl, CHANSVmMethodCount(VmMathMethodTbl)) == 0) {
goto class_fail;
}
@@ -6235,13 +6235,13 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
/* Image class */
VmImageAllocCallback = vmNull;
VmImageCtorCallback = vmNull;
if (CHANSVmNewBuiltinObject(vm, lbl_8169778C, vmNull, VmImageCtor, vmNull, vmNull, vmNull, VmImagePropertyTbl, CHANSVmPropertyCount(VmImagePropertyTbl),
if (CHANSVmNewBuiltinObject(vm, scImageClassName, vmNull, VmImageCtor, vmNull, vmNull, vmNull, VmImagePropertyTbl, CHANSVmPropertyCount(VmImagePropertyTbl),
vmNull, 0) == 0) {
goto class_fail;
}
/* Screen (@WinEmu) class */
if (CHANSVmNewBuiltinObject(vm, lbl_816977BC, vmNull, vmNull, vmNull, "document", vmNull, vmNull, 0, (CHANSVmMethodList*)&VmWinEmuMethodTbl,
if (CHANSVmNewBuiltinObject(vm, scWinEmuInternalName, vmNull, vmNull, vmNull, "document", vmNull, vmNull, 0, (CHANSVmMethodList*)&VmWinEmuMethodTbl,
CHANSVmMethodCount(VmWinEmuMethodTbl)) == 0) {
class_fail:
result = CHANS_VM_ERR_NATIVE_METHOD_INIT;
@@ -7417,7 +7417,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
}
default: {
// TODO: This is an inlined function called "VmGetResultType"
CHANS_VM_PRINTF_CUSTOM("%s: no table for op '%c'\n", lbl_81669128, opKind);
CHANS_VM_PRINTF_CUSTOM("%s: no table for op '%c'\n", scVmGetResultType, opKind);
goto error_setter;
}
}

View File

@@ -139,18 +139,18 @@ extern "C" asm void draw__Q39textinput11nw4rmanager6LayoutFv();
extern "C" asm void searchPaneComponent__Q39textinput3gui11PaneManagerFPCc();
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8165C820[];
extern "C" const char lbl_8165C830[];
extern "C" const char lbl_8165C8C0[];
extern "C" const char lbl_8165C8CC[];
extern "C" const char lbl_8165C8E0[];
extern "C" const char lbl_8165C8F0[];
extern "C" const char lbl_8165C900[];
extern "C" const char lbl_8165C918[];
extern "C" const char lbl_8165C928[];
extern "C" const char lbl_8165C938[];
extern "C" const char lbl_8165C950[];
extern "C" const char lbl_8165C960[];
extern "C" const char scP_txtScrll_UP[];
extern "C" const char scP_txtScrll_DOWN[];
extern "C" const char scN_JPNUSAEUR[];
extern "C" const char scN_separateBarAll[];
extern "C" const char scT_2l_TextBox[];
extern "C" const char scT_title_textJPN[];
extern "C" const char scN_separateBarKOR[];
extern "C" const char scT_2l_TextBoxKOR[];
extern "C" const char scT_title_textKOR[];
extern "C" const char scN_separateBarCHN[];
extern "C" const char scT_2l_TextBoxCHN[];
extern "C" const char scT_title_textCHN[];
extern "C" const char lbl_816973A4[];
extern "C" const char lbl_816973AC[];
#pragma pop
@@ -314,7 +314,7 @@ void Base::resetContextPredict_() {
static GXColor kanaBackground = {128, 255, 128, 255};
static GXColor candidateBackground = {255, 210, 12, 255};
const char* csScrollButtonAnimationTarget = lbl_8165C820;
const char* csScrollButtonAnimationTarget = scP_txtScrll_UP;
struct InputFormAnimationFile {
u32 id;
@@ -337,14 +337,14 @@ extern "C" const InputFormAnimationFile csAninationFile__Q29textinput9inputform[
#pragma section data_type ".rodata"
extern "C" const VisiblePanes csVisiblePaneUEJ__Q29textinput9inputform = {
1, 2,
{lbl_8165C8C0, NULL, NULL, NULL},
{scN_JPNUSAEUR, NULL, NULL, NULL},
{"N_KOR", "N_CHN", NULL, NULL},
};
extern "C" const VisiblePanes csVisiblePaneKOR__Q29textinput9inputform = {
1, 2,
{"N_KOR", NULL, NULL, NULL},
{"N_CHN", lbl_8165C8C0, NULL, NULL},
{"N_CHN", scN_JPNUSAEUR, NULL, NULL},
};
extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
@@ -354,7 +354,7 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
0,
0,
"N_KOR",
lbl_8165C8C0,
scN_JPNUSAEUR,
0,
0,
0,
@@ -362,23 +362,23 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
extern "C" const LanguagePaneData csLanguageDependencyDataUEJ__Q29textinput9inputform = {
&csVisiblePaneUEJ__Q29textinput9inputform,
lbl_8165C8CC,
lbl_8165C8E0,
lbl_8165C8F0,
scN_separateBarAll,
scT_2l_TextBox,
scT_title_textJPN,
};
extern "C" const LanguagePaneData csLanguageDependencyDataKOR__Q29textinput9inputform = {
&csVisiblePaneKOR__Q29textinput9inputform,
lbl_8165C900,
lbl_8165C918,
lbl_8165C928,
scN_separateBarKOR,
scT_2l_TextBoxKOR,
scT_title_textKOR,
};
extern "C" const LanguagePaneData csLanguageDependencyDataCHN__Q29textinput9inputform = {
reinterpret_cast<const VisiblePanes*>(csVisiblePaneCHN__Q29textinput9inputform),
lbl_8165C938,
lbl_8165C950,
lbl_8165C960,
scN_separateBarCHN,
scT_2l_TextBoxCHN,
scT_title_textCHN,
};
#pragma section data_type ".data"
@@ -417,8 +417,8 @@ bool mbHyphen = true;
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8165C820[] = "P_txtScrll_UP";
extern "C" const char lbl_8165C830[] = "P_txtScrll_DOWN";
extern "C" const char scP_txtScrll_UP[] = "P_txtScrll_UP";
extern "C" const char scP_txtScrll_DOWN[] = "P_txtScrll_DOWN";
struct ButtonAnimations {
KeyType type;
const char* paneName;
@@ -428,27 +428,27 @@ struct ButtonAnimations {
};
const ButtonAnimations csButtonAnimations[] = {
{KT_NormalButton, lbl_8165C820, 8, NULL, {
{KT_NormalButton, scP_txtScrll_UP, 8, NULL, {
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}},
{KT_NormalButton, lbl_8165C830, 8, csScrollButtonAnimationTarget, {
{KT_NormalButton, scP_txtScrll_DOWN, 8, csScrollButtonAnimationTarget, {
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}}
};
extern "C" const char lbl_8165C8C0[] = "N_JPNUSAEUR";
extern "C" const char lbl_8165C8CC[] = "N_separateBarAll";
extern "C" const char lbl_8165C8E0[] = "T_2l_TextBox";
extern "C" const char lbl_8165C8F0[] = "T_title_textJPN";
extern "C" const char lbl_8165C900[] = "N_separateBarKOR";
extern "C" const char lbl_8165C918[] = "T_2l_TextBoxKOR";
extern "C" const char lbl_8165C928[] = "T_title_textKOR";
extern "C" const char lbl_8165C938[] = "N_separateBarCHN";
extern "C" const char lbl_8165C950[] = "T_2l_TextBoxCHN";
extern "C" const char lbl_8165C960[] = "T_title_textCHN";
extern "C" const char scN_JPNUSAEUR[] = "N_JPNUSAEUR";
extern "C" const char scN_separateBarAll[] = "N_separateBarAll";
extern "C" const char scT_2l_TextBox[] = "T_2l_TextBox";
extern "C" const char scT_title_textJPN[] = "T_title_textJPN";
extern "C" const char scN_separateBarKOR[] = "N_separateBarKOR";
extern "C" const char scT_2l_TextBoxKOR[] = "T_2l_TextBoxKOR";
extern "C" const char scT_title_textKOR[] = "T_title_textKOR";
extern "C" const char scN_separateBarCHN[] = "N_separateBarCHN";
extern "C" const char scT_2l_TextBoxCHN[] = "T_2l_TextBoxCHN";
extern "C" const char scT_title_textCHN[] = "T_title_textCHN";
bool DeadKeyStream::sbCompatibleFilterEnabled = true;
inline bool DeadKeyStream::isCompatible(wchar_t character) {