Compare commits
6 Commits
cleanup/pf
...
match/tiPc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a881fa8c3 | ||
|
|
ca998ad7cf | ||
|
|
486c20c623 | ||
|
|
6adb0dc52e | ||
|
|
c9f64372cf | ||
|
|
9f4a70db74 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.38% | 87.96% | 62.33% | 92.07% |
|
||||
| 99.38% | 87.97% | 62.33% | 92.07% |
|
||||
|
||||
units 919/1027 complete, functions 12224/12563 matched.
|
||||
units 919/1027 complete, functions 12225/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 -->
|
||||
|
||||
@@ -6804,14 +6804,14 @@ VmStringSplice = .text:0x8144FDD8; // type:function size:0x1E4
|
||||
VmStringSplit = .text:0x8144FFBC; // type:function size:0x378
|
||||
VmStringToLowerCase = .text:0x81450334; // type:function size:0xB4
|
||||
VmStringToUpperCase = .text:0x814503E8; // type:function size:0xB4
|
||||
CHANSVm_8145049C = .text:0x8145049C; // type:function size:0x6BC
|
||||
CHANSVmFormatString = .text:0x8145049C; // type:function size:0x6BC
|
||||
VmStringFormat = .text:0x81450B58; // type:function size:0x4C
|
||||
VmGetStrFromObjHdr = .text:0x81450BA4; // type:function size:0x24
|
||||
VmGetIntFromObjHdr = .text:0x81450BC8; // type:function size:0x24
|
||||
VmBlobInitValue = .text:0x81450BEC; // type:function size:0x20 scope:local
|
||||
VmBlobCreateDirect = .text:0x81450C0C; // type:function size:0xAC scope:local
|
||||
VmBlobGetDataBufferDirect = .text:0x81450CB8; // type:function size:0x5C scope:local
|
||||
CHANSVm_81450D14 = .text:0x81450D14; // type:function size:0xB8
|
||||
CHANSVmBlobResolveOffset = .text:0x81450D14; // type:function size:0xB8
|
||||
VmBlobCtor = .text:0x81450DCC; // type:function size:0xA8 scope:local
|
||||
VmBlobDtor = .text:0x81450E74; // type:function size:0x28 scope:local
|
||||
VmBlobGetOffset = .text:0x81450E9C; // type:function size:0x68
|
||||
@@ -6820,8 +6820,8 @@ VmBlobSkip = .text:0x81450FC8; // type:function size:0xF0
|
||||
VmBlobGetLength = .text:0x814510B8; // type:function size:0x68
|
||||
VmBlobSetLength = .text:0x81451120; // type:function size:0xF8
|
||||
VmBlobFill = .text:0x81451218; // type:function size:0xFC
|
||||
CHANSVm_81451314 = .text:0x81451314; // type:function size:0x34
|
||||
CHANSVm_81451348 = .text:0x81451348; // type:function size:0x50
|
||||
CHANSVmBlobGetCount = .text:0x81451314; // type:function size:0x34
|
||||
CHANSVmBlobHasSpace = .text:0x81451348; // type:function size:0x50
|
||||
VmBlobGetString = .text:0x81451398; // type:function size:0xC8
|
||||
VmBlobSetString = .text:0x81451460; // type:function size:0x12C
|
||||
VmBlobGetWString = .text:0x8145158C; // type:function size:0xE0
|
||||
@@ -6857,7 +6857,7 @@ VmBlobSetS32 = .text:0x814532E4; // type:function size:0xD8
|
||||
VmBlobSetS64 = .text:0x814533BC; // type:function size:0xE4
|
||||
vmBlobParsePackFormatString = .text:0x814534A0; // type:function size:0x1D0
|
||||
VmBlobPackCommon = .text:0x81453670; // type:function size:0xA70 scope:local
|
||||
CHANSVm_814540E0 = .text:0x814540E0; // type:function size:0x6C
|
||||
CHANSVmMakeU64 = .text:0x814540E0; // type:function size:0x6C
|
||||
VmBlobCreate = .text:0x8145414C; // type:function size:0x8
|
||||
VmBlobPack = .text:0x81454154; // type:function size:0x8
|
||||
VmBlobUnpack = .text:0x8145415C; // type:function size:0x814
|
||||
@@ -6875,7 +6875,7 @@ CHANSVmGetFreeExeSize = .text:0x81455198; // type:function size:0x28
|
||||
CHANSVmAddExe = .text:0x814551C0; // type:function size:0x3F8
|
||||
VmOffsU32ToPtr = .text:0x814555B8; // type:function size:0x18 scope:local
|
||||
CHANSConvertModuleOfsToPtr = .text:0x814555D0; // type:function size:0x84
|
||||
CHANSVm_81455654 = .text:0x81455654; // type:function size:0x8C
|
||||
CHANSVmLookupScopedObject = .text:0x81455654; // type:function size:0x8C
|
||||
VmPushFuncReturnInfo = .text:0x814556E0; // type:function size:0x1AC scope:local
|
||||
VmReturnWithValue = .text:0x8145588C; // type:function size:0x1D4 scope:local
|
||||
CHANSVmLinkModules = .text:0x81455A60; // type:function size:0x2F4
|
||||
@@ -24048,7 +24048,7 @@ g_detach_func = .sbss:0x8169970C; // type:object size:0x4 scope:local data:4byte
|
||||
st_uhs_msc_status = .sbss:0x81699710; // type:object size:0x4 scope:local data:4byte
|
||||
st_uhs_msc_msgid = .sbss:0x81699714; // type:object size:0x4 scope:local data:4byte
|
||||
st_uhs_msc_tskid = .sbss:0x81699718; // type:object size:0x4 scope:local data:4byte
|
||||
uhg_msc_memid = .sbss:0x8169971C; // type:object size:0x4 scope:local data:4byte
|
||||
uhg_msc_memid = .sbss:0x8169971C; // type:object size:0x4 data:4byte
|
||||
st_uhs_msc_blk_buf = .sbss:0x81699720; // type:object size:0x4 scope:local data:4byte
|
||||
__sdCardStatus = .sbss:0x81699728; // type:object size:0x4 scope:local data:4byte
|
||||
__sdReq = .sbss:0x8169972C; // type:object size:0x4 scope:local data:4byte
|
||||
|
||||
@@ -42,7 +42,7 @@ typedef struct UHF_MSC_MESSAGE {
|
||||
} UHF_MSC_MESSAGE;
|
||||
|
||||
extern UHF_MSC_DEVICE uhg_msc_blk_device_tbl[8];
|
||||
extern s32 uhg_msc_memid_8169971C;
|
||||
extern s32 uhg_msc_memid;
|
||||
s32 uhf_ker_set_priority(s32 task_id, s32 priority);
|
||||
void* uhf_ker_get_memory_block(s32 pool, u32 size, u32 alignment);
|
||||
s32 uhf_ker_release_memory_block(s32 pool, void* block);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/fa/puh_msc.h>
|
||||
|
||||
s32 uhg_msc_memid_8169971C;
|
||||
s32 uhg_msc_memid;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_status;
|
||||
@@ -47,13 +47,13 @@ static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command
|
||||
s32 result = 0;
|
||||
s32 semaphore;
|
||||
UHF_MSC_MESSAGE* message;
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid_8169971C, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
if (message == NULL) {
|
||||
return -12;
|
||||
}
|
||||
semaphore = uhf_ker_create_sem(0, 0);
|
||||
if (semaphore <= 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
return -12;
|
||||
}
|
||||
message->command = command;
|
||||
@@ -61,7 +61,7 @@ static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command
|
||||
message->result = &result;
|
||||
message->parameters = *parameters;
|
||||
if (uhf_ker_send_message(st_uhs_msc_msgid, message, 0) != 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
uhf_ker_delete_sem(semaphore);
|
||||
return -12;
|
||||
}
|
||||
|
||||
@@ -287,13 +287,13 @@ s32 _uhf_msc_blk_send_message(UHF_MSC_PARAMETERS* parameters, u32 command) {
|
||||
s32 semaphore;
|
||||
UHF_MSC_MESSAGE* message;
|
||||
s32 mailbox = uhf_msc_get_message_id();
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid_8169971C, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
if (message == NULL) {
|
||||
return -1;
|
||||
}
|
||||
semaphore = uhf_ker_create_sem(0, 0);
|
||||
if (semaphore <= 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
return -1;
|
||||
}
|
||||
message->command = command;
|
||||
@@ -301,7 +301,7 @@ s32 _uhf_msc_blk_send_message(UHF_MSC_PARAMETERS* parameters, u32 command) {
|
||||
message->result = &result;
|
||||
message->parameters = *parameters;
|
||||
if (uhf_ker_send_message(mailbox, message, 0) != 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
uhf_ker_delete_sem(semaphore);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1282,11 +1282,13 @@ s32 PFFAT_GetSectorSpecified(PFFAT_FFD* file, u32 fileSectorIndex,
|
||||
|
||||
error = PFFAT_GetSector(file, fileSectorIndex, clusterIndex != 0, 0,
|
||||
sector);
|
||||
if (error != 0) {
|
||||
goto done;
|
||||
switch (error) {
|
||||
case 0:
|
||||
error = 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
error = 0;
|
||||
done:
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
@@ -3400,7 +3400,7 @@ VmMethodDefine(String, ToUpperCase) {
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8145049C(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
CHANSVmObjHdr* CHANSVmFormatString(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
u8 pad0[8];
|
||||
u8 tempBuf[16];
|
||||
u8 fmtBufData[32];
|
||||
@@ -3745,7 +3745,7 @@ null_return:
|
||||
VmMethodDefine(String, Format) {
|
||||
u32 result;
|
||||
if (VmParentObj != vmNull && VmParentObj->type == CHANS_VM_TYPE_CLASS_REF) {
|
||||
result = (u32)CHANSVm_8145049C(VmInst, VmReturnObj, 0);
|
||||
result = (u32)CHANSVmFormatString(VmInst, VmReturnObj, 0);
|
||||
return result != 0;
|
||||
}
|
||||
return 0;
|
||||
@@ -3775,10 +3775,10 @@ int VmGetIntFromObjHdr(CHANSVmObjHdr* object) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit);
|
||||
BOOL CHANSVm_81451348(BlobHeader* blob, s64 size);
|
||||
u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit);
|
||||
BOOL CHANSVmBlobHasSpace(BlobHeader* blob, s64 size);
|
||||
CHANSVmObjHdr* CHANSVmNewBlobObject(CHANSVm* VmInst, CHANSVmObjHdr* obj, u32 size, void* src, u32 count);
|
||||
static u64 CHANSVm_814540E0(u32 upper, u32 lower);
|
||||
static u64 CHANSVmMakeU64(u32 upper, u32 lower);
|
||||
|
||||
static void VmBlobInitValue(BlobHeader* blob, u32 size) {
|
||||
if (blob != vmNull) {
|
||||
@@ -3834,7 +3834,7 @@ static u8* VmBlobGetDataBufferDirect(CHANSVmObjHdr* obj) {
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
BOOL CHANSVm_81450D14(BlobHeader* blob, s64 val, u32* out) {
|
||||
BOOL CHANSVmBlobResolveOffset(BlobHeader* blob, s64 val, u32* out) {
|
||||
s64 pos;
|
||||
|
||||
if (blob == vmNull) {
|
||||
@@ -3901,7 +3901,7 @@ VmMethodDefine(Blob, Seek) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, val->value.int_v, &tmp)) {
|
||||
if (CHANSVmBlobResolveOffset(blob, val->value.int_v, &tmp)) {
|
||||
blob->offset = tmp;
|
||||
} else {
|
||||
return 0;
|
||||
@@ -3988,9 +3988,9 @@ VmMethodDefine(Blob, Fill) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, fill, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, fill, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count)) {
|
||||
if (CHANSVmBlobHasSpace(blob, count)) {
|
||||
memset(blob->pData + blob->offset, (u8)val->value.int_v, count);
|
||||
blob->offset += count;
|
||||
return 1;
|
||||
@@ -3999,7 +3999,7 @@ VmMethodDefine(Blob, Fill) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
if (ptr != vmNull) {
|
||||
return *(u32*)((u8*)ptr + 4);
|
||||
}
|
||||
@@ -4013,7 +4013,7 @@ u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
BOOL CHANSVm_81451348(BlobHeader* blob, s64 size) {
|
||||
BOOL CHANSVmBlobHasSpace(BlobHeader* blob, s64 size) {
|
||||
u32 curOff = blob->offset;
|
||||
return size >= 0 && (s64)(blob->size - curOff) >= size;
|
||||
}
|
||||
@@ -4028,7 +4028,7 @@ VmMethodDefine(Blob, GetString) {
|
||||
}
|
||||
|
||||
size = (u32)arg->value.int_v;
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
CHANSVmErr err = CHANSVmSetU16StringFromU8(VmInst, VmReturnObj, (char*)(blob->pData + blob->offset), size);
|
||||
blob->offset += size;
|
||||
return err == CHANS_VM_OK;
|
||||
@@ -4058,7 +4058,7 @@ VmMethodDefine(Blob, SetString) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
memset(blob->pData + blob->offset, 0, size);
|
||||
CHANSVmStrCpyToU8FromU16(blob->pData + blob->offset, strData, charCount);
|
||||
blob->offset += size;
|
||||
@@ -4076,7 +4076,7 @@ VmMethodDefine(Blob, GetWString) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, VM_STR_LENGTH(arg->value.int_v))) {
|
||||
if (CHANSVmBlobHasSpace(blob, VM_STR_LENGTH(arg->value.int_v))) {
|
||||
CHANSVmErr err = CHANSVmSetU16String(VmInst, VmReturnObj, (wchar_t*)(blob->pData + blob->offset), (u32)arg->value.int_v << 1);
|
||||
u32 oldOffset = blob->offset;
|
||||
u64 length = VM_STR_LENGTH(arg->value.int_v);
|
||||
@@ -4113,7 +4113,7 @@ VmMethodDefine(Blob, SetWString) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
memcpy(blob->pData + blob->offset, strData, strLen);
|
||||
if (strLen < size) {
|
||||
memset(blob->pData + blob->offset + strLen, 0, size - strLen);
|
||||
@@ -4184,8 +4184,8 @@ VmMethodDefine(Blob, CopyRangeFrom) {
|
||||
srcOff = 0;
|
||||
destOff = 0;
|
||||
|
||||
if (CHANSVm_81450D14(destBlob, destOffObj->value.int_v, &destOff) != 0 && CHANSVm_81450D14(srcBlob, srcOffObj->value.int_v, &srcOff) != 0) {
|
||||
count = CHANSVm_81451314(srcBlob, countObj, srcOff);
|
||||
if (CHANSVmBlobResolveOffset(destBlob, destOffObj->value.int_v, &destOff) != 0 && CHANSVmBlobResolveOffset(srcBlob, srcOffObj->value.int_v, &srcOff) != 0) {
|
||||
count = CHANSVmBlobGetCount(srcBlob, countObj, srcOff);
|
||||
{
|
||||
u32 destinationOffset = destOff;
|
||||
okFlag = (s64)count >= 0 && (s64)(destBlob->size - destinationOffset) >= (s64)count;
|
||||
@@ -4213,9 +4213,9 @@ VmMethodDefine(Blob, GetBlob) {
|
||||
if (blob == vmNull)
|
||||
return 0;
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, arg, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, arg, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count)) {
|
||||
if (CHANSVmBlobHasSpace(blob, count)) {
|
||||
if (CHANSVmNewBlobObject(VmInst, VmReturnObj, count, blob->offset + blob->pData, count) != vmNull) {
|
||||
blob->offset += count;
|
||||
return 1;
|
||||
@@ -4262,7 +4262,7 @@ VmMethodDefine(Blob, SetBlob) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(destBlob, logicalSize)) {
|
||||
if (CHANSVmBlobHasSpace(destBlob, logicalSize)) {
|
||||
memmove(destBlob->pData + *(u32*)&destBlob->offset, srcBlob->pData + srcBlob->offset, copySize);
|
||||
if (copySize < logicalSize) {
|
||||
memset(destBlob->offset + destBlob->pData + copySize, 0, logicalSize - copySize);
|
||||
@@ -4284,9 +4284,9 @@ VmMethodDefine(Blob, GetHexString) {
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, arg, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, arg, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count) && CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, count * 4) != vmNull) {
|
||||
if (CHANSVmBlobHasSpace(blob, count) && CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, count * 4) != vmNull) {
|
||||
wchar_t* dest = (wchar_t*)VmGetStrFromObjHdr(VmReturnObj);
|
||||
u8* src = blob->pData;
|
||||
u32 offset = blob->offset;
|
||||
@@ -4352,8 +4352,8 @@ VmMethodDefine(Blob, CalcRangeSHA1Digest) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
|
||||
{
|
||||
u32 off = offset;
|
||||
@@ -4417,8 +4417,8 @@ VmMethodDefine(Blob, CalcRangeMD5Digest) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
|
||||
{
|
||||
u32 off = offset;
|
||||
@@ -4464,8 +4464,8 @@ VmMethodDefine(Blob, CalcRangeCRC16) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
{
|
||||
u32 off = offset;
|
||||
if (((s64)size >= 0LL && (s64)(blob->size - off) >= (s64)size) != vmFalse) {
|
||||
@@ -4500,8 +4500,8 @@ VmMethodDefine(Blob, CalcRangeCRC32) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
{
|
||||
u32 off = offset;
|
||||
|
||||
@@ -4573,8 +4573,8 @@ VmMethodDefine(Blob, CalcRangeHMAC) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
off = offset;
|
||||
if (((s64)size >= 0LL && (s64)(blob->size - off) >= (s64)size) != vmFalse) {
|
||||
NETHMACContext ctx;
|
||||
@@ -5202,7 +5202,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
copySize = paramValue;
|
||||
}
|
||||
|
||||
if (copySize < 0 || !CHANSVm_81451348(parentBlob, copySize)) {
|
||||
if (copySize < 0 || !CHANSVmBlobHasSpace(parentBlob, copySize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5220,7 +5220,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
if (paramValue < 0 || !CHANSVm_81451348(parentBlob, paramValue)) {
|
||||
if (paramValue < 0 || !CHANSVmBlobHasSpace(parentBlob, paramValue)) {
|
||||
goto error;
|
||||
}
|
||||
if (paramValue > 0) {
|
||||
@@ -5247,7 +5247,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, elemSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5342,7 +5342,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
*(u64*)packBuf = CHANSVm_814540E0(packBuf[0], packBuf[1]);
|
||||
*(u64*)packBuf = CHANSVmMakeU64(packBuf[0], packBuf[1]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -5379,7 +5379,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, elemSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5424,7 +5424,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
}
|
||||
|
||||
bufSize = (count + 1) / 2;
|
||||
if (!CHANSVm_81451348(parentBlob, bufSize)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, bufSize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5472,7 +5472,7 @@ error:
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
static u64 CHANSVm_814540E0(u32 upper, u32 lower) {
|
||||
static u64 CHANSVmMakeU64(u32 upper, u32 lower) {
|
||||
// Read U64 and byte-swap
|
||||
u64 x = (u64)upper << 32 | lower;
|
||||
return x >> 56 & 0x00000000000000ffULL | x >> 40 & 0x000000000000ff00ULL | x >> 24 & 0x0000000000ff0000ULL | x >> 8 & 0x00000000ff000000ULL |
|
||||
@@ -5648,7 +5648,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
} else {
|
||||
count = outVal;
|
||||
}
|
||||
if (count < 0 || !CHANSVm_81451348(srcBlob, count)) {
|
||||
if (count < 0 || !CHANSVmBlobHasSpace(srcBlob, count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5663,7 +5663,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
if (outVal < 0 || !CHANSVm_81451348(srcBlob, outVal)) {
|
||||
if (outVal < 0 || !CHANSVmBlobHasSpace(srcBlob, outVal)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5682,7 +5682,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
} else {
|
||||
count = outVal;
|
||||
}
|
||||
if (count < 0 || !CHANSVm_81451348(srcBlob, outSize * count)) {
|
||||
if (count < 0 || !CHANSVmBlobHasSpace(srcBlob, outSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5710,7 +5710,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
unpackBuf.value = CHANSVm_814540E0(unpackBuf.words[0], unpackBuf.words[1]);
|
||||
unpackBuf.value = CHANSVmMakeU64(unpackBuf.words[0], unpackBuf.words[1]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -5794,7 +5794,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
}
|
||||
count = (srcBlob->size - srcBlob->offset) / outSize;
|
||||
}
|
||||
if ((s32)count < 0 || !CHANSVm_81451348(srcBlob, outSize * count)) {
|
||||
if ((s32)count < 0 || !CHANSVmBlobHasSpace(srcBlob, outSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5845,7 +5845,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
}
|
||||
|
||||
bufSize = (s32)(count + 1) / 2;
|
||||
if (!CHANSVm_81451348(srcBlob, bufSize)) {
|
||||
if (!CHANSVmBlobHasSpace(srcBlob, bufSize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -6466,7 +6466,7 @@ void CHANSConvertModuleOfsToPtr(CHANSVmModule* ptr) {
|
||||
VmOffsU32ToPtr((void**)&ptr->pLineTbl, ptr);
|
||||
}
|
||||
|
||||
static CHANSVmObjHdr* CHANSVm_81455654(CHANSVm* vm, s32 id) {
|
||||
static CHANSVmObjHdr* CHANSVmLookupScopedObject(CHANSVm* vm, s32 id) {
|
||||
CHANSVmObjHdr* data = vmNull;
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
CHANSVmExecutionCtx* ctx = pVm->pActiveCtx;
|
||||
@@ -6755,7 +6755,7 @@ static CHANSVmErr VmReturnWithValue(CHANSVm* vm, u32 val) {
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < pVm->pActiveCtx->pDbg->moduleCount; i++) {
|
||||
if (CHANSVmDeleteObject(vm, CHANSVm_81455654(vm, i)) != CHANS_VM_OK) {
|
||||
if (CHANSVmDeleteObject(vm, CHANSVmLookupScopedObject(vm, i)) != CHANS_VM_OK) {
|
||||
return CHANS_VM_ERR_RETURN;
|
||||
}
|
||||
}
|
||||
@@ -6873,7 +6873,7 @@ CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 unk0) {
|
||||
CHANSVmObjHdr* obj;
|
||||
if (idx >= module->moduleCount) {
|
||||
goto pass3_idx_err;
|
||||
} else if (obj = CHANSVm_81455654(vm, idx), obj == vmNull) {
|
||||
} else if (obj = CHANSVmLookupScopedObject(vm, idx), obj == vmNull) {
|
||||
goto pass3_obj_err;
|
||||
} else if (obj->type == CHANS_VM_OBJ_TYPE_BLANK) {
|
||||
goto pass3_success;
|
||||
@@ -7818,7 +7818,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
result = CHANS_VM_ERR_GET_PROPERTY_NAME;
|
||||
arrayIdx = 0;
|
||||
imm16Val = VM_READ_BE_U16(operandBuf, 0);
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
accumulator = &pVm->accumulator;
|
||||
if (foundObj != vmNull && accumulator->type == CHANS_VM_OBJ_TYPE_INTEGER &&
|
||||
(computedAddr = accumulator->value.data.len, (u64)accumulator->value.int_v <= ~1U)) {
|
||||
@@ -7954,7 +7954,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
if (operandBuf == vmNull) {
|
||||
return CHANS_VM_ERR_CODE_RANGE;
|
||||
}
|
||||
foundObj = CHANSVm_81455654(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
|
||||
result = VmDeleteCommon(vm, foundObj);
|
||||
break;
|
||||
}
|
||||
@@ -7982,12 +7982,12 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
imm16Val = (opcodeVal << 8 | operandBuf[1]) & 0x1FFF;
|
||||
switch (opcodeVal & CHANS_VM_OP_SYMBOL_STORE) {
|
||||
case 0: {
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
result = VmStore(vm, &pVm->accumulator, foundObj);
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OP_SYMBOL_STORE: {
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
result = VmStore(vm, foundObj, &pVm->accumulator);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -2539,11 +2539,14 @@ namespace textinput {
|
||||
u32 koreanCode = code;
|
||||
if (caps)
|
||||
koreanCode = util::reverseLetterCaseW(koreanCode);
|
||||
u16 mapped;
|
||||
if (koreanCode >= L'a' && koreanCode <= L'z')
|
||||
koreanCode = KOREAN_LOWER[static_cast<u16>(koreanCode) - L'a'];
|
||||
mapped = KOREAN_LOWER[static_cast<u16>(koreanCode) - L'a'];
|
||||
else if (koreanCode >= L'A' && koreanCode <= L'Z')
|
||||
koreanCode = KOREAN_UPPER[static_cast<u16>(koreanCode) - L'A'];
|
||||
code = koreanCode;
|
||||
mapped = KOREAN_UPPER[static_cast<u16>(koreanCode) - L'A'];
|
||||
else
|
||||
mapped = koreanCode;
|
||||
code = mapped;
|
||||
}
|
||||
}
|
||||
animation = searchAnmPane(code);
|
||||
|
||||
Reference in New Issue
Block a user