Compare commits
3 Commits
mslmisc-cl
...
agent/w100
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2771d8c47a | ||
|
|
970a59cfc9 | ||
|
|
ad9578542a |
@@ -4814,7 +4814,7 @@ reset_gui__Q33ipl5scene8SDButtonFv = .text:0x813E9BC0; // type:function size:0x1
|
||||
startPointEvent__Q33ipl5scene8SDButtonFPCcPQ33ipl10controller9Interface = .text:0x813E9D08; // type:function size:0x258
|
||||
startLeftEvent__Q33ipl5scene8SDButtonFPCc = .text:0x813E9F60; // type:function size:0x220
|
||||
isActive__Q33ipl5scene8SDButtonCFv = .text:0x813EA180; // type:function size:0xC
|
||||
setEventHandler__Q33ipl5scene8SDButtonFPQ23gui12EventHandler = .text:0x813EA18C; // type:function size:0x14
|
||||
setEventHandler__Q33ipl5scene8SDButtonFPQ23gui12EventHandlerPQ23gui12EventHandler = .text:0x813EA18C; // type:function size:0x14
|
||||
setText__Q33ipl5scene8SDButtonFPCcPCw = .text:0x813EA1A0; // type:function size:0xB4
|
||||
animation__Q33ipl5scene8SDButtonFi = .text:0x813EA254; // type:function size:0x1C4
|
||||
initArrowAppearance__Q33ipl5scene8SDButtonFib = .text:0x813EA418; // type:function size:0xD0
|
||||
|
||||
@@ -102,7 +102,12 @@ namespace ipl {
|
||||
static const char* getButtonName(int button) { return smButtonName[button]; }
|
||||
#endif
|
||||
|
||||
void setEventHandler(::gui::EventHandler * event);
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
void setEventHandler(::gui::EventHandler * event,
|
||||
::gui::EventHandler * optOutEvent = NULL);
|
||||
#else
|
||||
void setEventHandler(::gui::EventHandler * event, ::gui::EventHandler * optOutEvent);
|
||||
#endif
|
||||
|
||||
void setText(const char* paneName, u32 msgId);
|
||||
void setText(const char* paneName, const wchar_t* text);
|
||||
|
||||
@@ -368,20 +368,20 @@ namespace nw4r {
|
||||
|
||||
u32 sheetOffsetsScratchSize;
|
||||
|
||||
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
|
||||
dataBlockCount = font->hdr.dataBlocks; // 0x0E
|
||||
sheetGlyphCount = font->glgr.inner.sheetGlyphCount; // 0x1C
|
||||
// countName = font->glgr.inner.nameCount;
|
||||
countSheet = font->glgr.inner.sheetCount;
|
||||
// count0A = font->glgr.inner.smthCount_0x0a;
|
||||
// count0C = font->glgr.inner.smthCount_0x0c;
|
||||
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
|
||||
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
|
||||
|
||||
stepSheetFlags = detail::CalcSizeFlagSet(countSheet);
|
||||
flagsSheetsOff = detail::CalcOffsetSheetFlags(font->glgr.inner.nameCount, countSheet, font->glgr.inner.smthCount_0x0a,
|
||||
font->glgr.inner.smthCount_0x0c);
|
||||
flagsSheets = (const u32*)font + (flagsSheetsOff >> 2);
|
||||
|
||||
sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
|
||||
sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)font + ctx->remWorkSpace()) - sheetOffsetsSize, 2);
|
||||
|
||||
pGlgr = &font->glgr;
|
||||
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
|
||||
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
|
||||
|
||||
@@ -69,7 +69,16 @@ void NETMD5GetDigest(NETMD5Context* context, void* digest) {
|
||||
}
|
||||
|
||||
#define ROTATE(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
|
||||
#define STEP(a, b, c, d, f, word, n) ((a) += (f), (a) = (b) + ROTATE(__lwbrx(0, (int)(word)) + (*constant + (a)), n))
|
||||
#define STEP(a, b, c, d, f, word, n) \
|
||||
do { \
|
||||
u32* _p = (word); \
|
||||
u32 _k = *constant; \
|
||||
u32 _xw = __lwbrx(_p, 0); \
|
||||
u32 _wc = __lwbrx(_p, 0) + _k; \
|
||||
(a) += (f); \
|
||||
(a) = (b) + ((_wc + (a)) << (n) | (_xw + (_k + (a))) >> (32 - (n))); \
|
||||
++constant; \
|
||||
} while (0)
|
||||
|
||||
static void ProcessBlock(NETMD5Context* context) {
|
||||
static u32 constants[64] = {0xD76AA478, 0xE8C7B756, 0x242070DB, 0xC1BDCEEE, 0xF57C0FAF, 0x4787C62A, 0xA8304613, 0xFD469501, 0x698098D8, 0x8B44F7AF, 0xFFFF5BB1, 0x895CD7BE, 0x6B901122, 0xFD987193, 0xA679438E, 0x49B40821, 0xF61E2562, 0xC040B340, 0x265E5A51, 0xE9B6C7AA, 0xD62F105D, 0x02441453, 0xD8A1E681, 0xE7D3FBC8, 0x21E1CDE6, 0xC33707D6, 0xF4D50D87, 0x455A14ED, 0xA9E3E905, 0xFCEFA3F8, 0x676F02D9, 0x8D2A4C8A, 0xFFFA3942, 0x8771F681, 0x6D9D6122, 0xFDE5380C, 0xA4BEEA44, 0x4BDECFA9, 0xF6BB4B60, 0xBEBFBC70, 0x289B7EC6, 0xEAA127FA, 0xD4EF3085, 0x04881D05, 0xD9D4D039, 0xE6DB99E5, 0x1FA27CF8, 0xC4AC5665, 0xF4292244, 0x432AFF97, 0xAB9423A7, 0xFC93A039, 0x655B59C3, 0x8F0CCC92, 0xFFEFF47D, 0x85845DD1, 0x6FA87E4F, 0xFE2CE6E0, 0xA3014314, 0x4E0811A1, 0xF7537E82, 0xBD3AF235, 0x2AD7D2BB, 0xEB86D391};
|
||||
@@ -83,30 +92,30 @@ static void ProcessBlock(NETMD5Context* context) {
|
||||
block = context->buffer32;
|
||||
word = block;
|
||||
constant = constants;
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,(b & c) | (~b & d),word++,7);
|
||||
STEP(d,a,b,c,(a & b) | (~a & c),word++,12);
|
||||
STEP(c,d,a,b,(d & a) | (~d & b),word++,17);
|
||||
STEP(b,c,d,a,(c & d) | (~c & a),word++,22);
|
||||
}
|
||||
index = indices;
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,(b & c) | (~b & d),word,7); ++word; ++constant;
|
||||
STEP(d,a,b,c,(a & b) | (~a & c),word,12); ++word; ++constant;
|
||||
STEP(c,d,a,b,(d & a) | (~d & b),word,17); ++word; ++constant;
|
||||
STEP(b,c,d,a,(c & d) | (~c & a),word,22); ++word; ++constant;
|
||||
STEP(a,b,c,d,(b & d) | (c & ~d),block + *index++,5);
|
||||
STEP(d,a,b,c,(a & c) | (b & ~c),block + *index++,9);
|
||||
STEP(c,d,a,b,(d & b) | (a & ~b),block + *index++,14);
|
||||
STEP(b,c,d,a,(c & a) | (d & ~a),block + *index++,20);
|
||||
}
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,(b & d) | (c & ~d),block + *index,5); ++index; ++constant;
|
||||
STEP(d,a,b,c,(a & c) | (b & ~c),block + *index,9); ++index; ++constant;
|
||||
STEP(c,d,a,b,(d & b) | (a & ~b),block + *index,14); ++index; ++constant;
|
||||
STEP(b,c,d,a,(c & a) | (d & ~a),block + *index,20); ++index; ++constant;
|
||||
STEP(a,b,c,d,d ^ b ^ c,block + *index++,4);
|
||||
STEP(d,a,b,c,c ^ a ^ b,block + *index++,11);
|
||||
STEP(c,d,a,b,b ^ d ^ a,block + *index++,16);
|
||||
STEP(b,c,d,a,a ^ c ^ d,block + *index++,23);
|
||||
}
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,d ^ b ^ c,block + *index,4); ++index; ++constant;
|
||||
STEP(d,a,b,c,c ^ a ^ b,block + *index,11); ++index; ++constant;
|
||||
STEP(c,d,a,b,b ^ d ^ a,block + *index,16); ++index; ++constant;
|
||||
STEP(b,c,d,a,a ^ c ^ d,block + *index,23); ++index; ++constant;
|
||||
}
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,c ^ (b | ~d),block + *index,6); ++index; ++constant;
|
||||
STEP(d,a,b,c,b ^ (a | ~c),block + *index,10); ++index; ++constant;
|
||||
STEP(c,d,a,b,a ^ (d | ~b),block + *index,15); ++index; ++constant;
|
||||
STEP(b,c,d,a,d ^ (c | ~a),block + *index,21); ++index; ++constant;
|
||||
STEP(a,b,c,d,c ^ (b | ~d),block + *index++,6);
|
||||
STEP(d,a,b,c,b ^ (a | ~c),block + *index++,10);
|
||||
STEP(c,d,a,b,a ^ (d | ~b),block + *index++,15);
|
||||
STEP(b,c,d,a,d ^ (c | ~a),block + *index++,21);
|
||||
}
|
||||
context->a += a;
|
||||
context->b += b;
|
||||
|
||||
@@ -77,14 +77,15 @@ s32 NHTTPi_compareTokenN_HdrRecvBuf(const NHTTPResponseInfo* response, s32 posit
|
||||
NHTTPi_HDRBUFLIST* block;
|
||||
s32 offset;
|
||||
s8 character;
|
||||
if(position>=limit) return -1;
|
||||
FindHeaderBlock(response,position,&block,&offset);
|
||||
character=ReadHeaderChar(response,&block,&offset);
|
||||
while(LowerCase(character)==LowerCase(*token)) {
|
||||
if(*token==0 || *token==' ' || *token==delimiter || position==limit-1) return 0;
|
||||
if(position<limit) {
|
||||
FindHeaderBlock(response,position,&block,&offset);
|
||||
character=ReadHeaderChar(response,&block,&offset);
|
||||
++position;
|
||||
++token;
|
||||
while(LowerCase(character)==LowerCase(*token)) {
|
||||
if(*token==0 || *token==' ' || *token==delimiter || position==limit-1) return 0;
|
||||
character=ReadHeaderChar(response,&block,&offset);
|
||||
++position;
|
||||
++token;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -127,12 +127,18 @@ s32 NHTTPi_intToStr(char* destination, u32 value) {
|
||||
}
|
||||
|
||||
s32 NHTTPi_compareToken(const char* left, const char* right) {
|
||||
int leftCharacter, rightCharacter;
|
||||
s8 leftByte;
|
||||
goto loop;
|
||||
for (;;) {
|
||||
int rightCharacter=LowerCase(*right);
|
||||
int leftCharacter=LowerCase(*left);
|
||||
if(leftCharacter!=rightCharacter) break;
|
||||
if(*left==0 || *left==' ') return 0;
|
||||
if((s8)*left==0 || (s8)*left==' ') return 0;
|
||||
++left; ++right;
|
||||
loop:
|
||||
rightCharacter=*right + 0x20;
|
||||
if(!((*right>='A') & (*right<='Z'))) rightCharacter=*right;
|
||||
leftByte=(s8)*left;
|
||||
leftCharacter=LowerCase(leftByte);
|
||||
if(leftCharacter!=rightCharacter) break;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -13,8 +13,8 @@ int SOiIsBufferAddrCheck(void);
|
||||
void* SOiAlloc(u32, s32);
|
||||
void SOiFree(u32, void*, s32);
|
||||
|
||||
static int soSocketRegistered;
|
||||
const char* __SOCKETVersion="<< RVL_SDK - SOCKET \trelease build: Dec 12 2008 03:06:17 (0x4199_60831) >>";
|
||||
static int soSocketRegistered[2];
|
||||
const char* __SOCKETVersion ="<< RVL_SDK - SOCKET \trelease build: Dec 12 2008 03:06:17 (0x4199_60831) >>";
|
||||
|
||||
typedef struct SocketRequest { int socket; int type; int protocol; } SocketRequest;
|
||||
typedef struct AddressRequest { int socket; int hasAddress; SOSockAddr address; } AddressRequest;
|
||||
@@ -30,23 +30,17 @@ typedef struct InetRequest {
|
||||
union { struct { int family; u8 address[16]; } reply; u8 replyBlock[32]; };
|
||||
char text[1];
|
||||
} InetRequest;
|
||||
typedef struct RecvPayload {
|
||||
union { struct { int socket; int flags; } command; u8 commandBlock[32]; };
|
||||
SOSockAddr address;
|
||||
} RecvPayload;
|
||||
typedef struct RecvRequest {
|
||||
IOSIoVector vectors[4];
|
||||
RecvPayload payload;
|
||||
} RecvRequest;
|
||||
typedef struct SendCommand {
|
||||
int socket;
|
||||
int flags;
|
||||
int hasAddress;
|
||||
union { struct { int socket; int flags; } command; u8 commandBlock[32]; };
|
||||
SOSockAddr address;
|
||||
} SendCommand;
|
||||
} RecvRequest;
|
||||
typedef struct SendCmd {
|
||||
int socket; int flags; int hasAddress; SOSockAddr address;
|
||||
} SendCmd;
|
||||
typedef struct SendRequest {
|
||||
IOSIoVector vectors[4];
|
||||
SendCommand command;
|
||||
SendCmd command;
|
||||
} SendRequest;
|
||||
|
||||
static int RecvFrom(const char*, int, void*, int, int, SOSockAddr*);
|
||||
@@ -56,7 +50,7 @@ int SOSocket(int family, int type, int protocol) {
|
||||
s32 rm;
|
||||
SocketRequest* request;
|
||||
int result;
|
||||
if(!soSocketRegistered) { OSRegisterVersion(__SOCKETVersion); soSocketRegistered=1; }
|
||||
if(!soSocketRegistered[0]) { OSRegisterVersion(__SOCKETVersion); soSocketRegistered[0]=1; }
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(family==23) result=-5;
|
||||
else {
|
||||
@@ -96,7 +90,7 @@ int SOBind(int socket, void* address) {
|
||||
int result;
|
||||
AddressRequest* request;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!addr || addr->len>8 || addr->len<8) result=-28;
|
||||
if(!address || addr->len>8 || addr->len<8) result=-28;
|
||||
else {
|
||||
request=SOiAlloc(12,64);
|
||||
if(!request) result=-49;
|
||||
@@ -118,7 +112,7 @@ int SOConnect(int socket, void* address) {
|
||||
int result;
|
||||
AddressRequest* request;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!addr || addr->len>8 || addr->len<8) result=-28;
|
||||
if(!address || addr->len>8 || addr->len<8) result=-28;
|
||||
else {
|
||||
request=SOiAlloc(12,64);
|
||||
if(!request) result=-49;
|
||||
@@ -134,26 +128,24 @@ int SOConnect(int socket, void* address) {
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOGetSockName(int socket, void* address) {
|
||||
int SOGetSockName(int socket, SOSockAddr* address) {
|
||||
int size;
|
||||
int result;
|
||||
s32 rm;
|
||||
SOSockAddr* addr;
|
||||
SOSockAddr* reply;
|
||||
NameRequest* request;
|
||||
addr=address;
|
||||
SOSockAddr* reply;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!addr || addr->len>8 || addr->len<8) result=-28;
|
||||
if(!address || address->len>8 || address->len<8) result=-28;
|
||||
else {
|
||||
size=(addr->len+63)&~31;
|
||||
size=(address->len+63)&~31;
|
||||
request=SOiAlloc(12,size);
|
||||
if(!request) result=-49;
|
||||
else {
|
||||
request->socket=socket;
|
||||
reply=&request->address;
|
||||
memcpy(reply,addr,addr->len);
|
||||
result=IOS_Ioctl(rm,7,request,4,reply,addr->len);
|
||||
if(result>=0) memcpy(addr,reply,reply->len);
|
||||
memcpy(reply,address,address->len);
|
||||
result=IOS_Ioctl(rm,7,request,4,reply,address->len);
|
||||
if(result>=0) memcpy(address,reply,reply->len);
|
||||
SOiFree(12,request,size);
|
||||
}
|
||||
}
|
||||
@@ -207,10 +199,8 @@ int SOShutdown(int socket, int how) {
|
||||
}
|
||||
|
||||
int SOPoll(SOPollFD* fds, unsigned int count, s64 timeout) {
|
||||
s32 size;
|
||||
s32 bytes;
|
||||
s32 result;
|
||||
s32 rm;
|
||||
s32 size,bytes,result;
|
||||
PollRequest* request;
|
||||
SOPollFD* reply;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
@@ -267,17 +257,11 @@ char* SOInetNtoA(SOInAddr address) {
|
||||
|
||||
int SOInetPtoN(int family, const char* text, void* address) {
|
||||
s32 rm;
|
||||
int temporary;
|
||||
int size;
|
||||
int result;
|
||||
int bytes;
|
||||
int size,temporary,result,bytes;
|
||||
InetRequest* request;
|
||||
if((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
|
||||
bytes=0;
|
||||
switch (family) {
|
||||
case 2: bytes=4; break;
|
||||
default: break;
|
||||
}
|
||||
switch(family) { case 2: bytes=4; break; default: break; }
|
||||
if(!bytes) result=-5;
|
||||
else if(!text) result=-28;
|
||||
else {
|
||||
@@ -304,14 +288,11 @@ u32 SOHtoNl(u32 value) { return value; }
|
||||
u16 SOHtoNs(u16 value) { return value; }
|
||||
|
||||
static inline int DirectBuffer(const void* data, int length) {
|
||||
BOOL accessible;
|
||||
BOOL direct;
|
||||
BOOL aligned;
|
||||
direct=FALSE;
|
||||
aligned=FALSE;
|
||||
BOOL direct=FALSE;
|
||||
BOOL aligned=FALSE;
|
||||
if(((u32)data&31)==0 && length%32==0) aligned=TRUE;
|
||||
if(aligned) {
|
||||
accessible=TRUE;
|
||||
BOOL accessible=TRUE;
|
||||
if(SOiIsBufferAddrCheck()) {
|
||||
BOOL inMemory=FALSE;
|
||||
if(((u32)data&0x1fffffff)>=0x10000000 && ((u32)data&0x1fffffff)<0x18000000) inMemory=TRUE;
|
||||
@@ -324,13 +305,11 @@ static inline int DirectBuffer(const void* data, int length) {
|
||||
|
||||
static int RecvFrom(const char* name, int socket, void* data, int length, int flags, SOSockAddr* address) {
|
||||
s32 rm;
|
||||
void* buffer;
|
||||
int size;
|
||||
BOOL direct;
|
||||
int result,size;
|
||||
RecvRequest* request;
|
||||
RecvPayload* payload;
|
||||
int result;
|
||||
void* buffer;
|
||||
SOSockAddr* reply;
|
||||
BOOL direct;
|
||||
if(length>32768) length=32768;
|
||||
if((result=SOiPrepare(name,&rm))==0) {
|
||||
if(address && (address->len>8 || address->len<8)) result=-28;
|
||||
@@ -338,31 +317,31 @@ static int RecvFrom(const char* name, int socket, void* data, int length, int fl
|
||||
else {
|
||||
direct=TRUE;
|
||||
if(length && !DirectBuffer(data,length)) direct=FALSE;
|
||||
size=((address == NULL ? 0 : address->len)+95)&~31;
|
||||
size=((address==0 ? 0 : address->len)+95)&~31;
|
||||
request=SOiAlloc(12,size);
|
||||
if(direct == FALSE) buffer=SOiAlloc(13,(length+31)&~31);
|
||||
if(!direct) buffer=SOiAlloc(13,(length+31)&~31);
|
||||
else buffer=data;
|
||||
if(!request || !buffer) result=-49;
|
||||
else {
|
||||
payload=&request->payload;
|
||||
payload->command.socket=socket; payload->command.flags=flags;
|
||||
reply=&payload->address;
|
||||
request->vectors[0].base=(u8*)payload; request->vectors[0].length=8;
|
||||
request->command.socket=socket; request->command.flags=flags;
|
||||
reply=&request->address;
|
||||
request->vectors[0].base=(u8*)&request->command; request->vectors[0].length=8;
|
||||
request->vectors[1].base=buffer; request->vectors[1].length=length;
|
||||
if(!address) {
|
||||
request->vectors[2].base=NULL; request->vectors[2].length=0;
|
||||
result=IOS_Ioctlv(rm,12,1,2,request->vectors);
|
||||
} else {
|
||||
memcpy(reply,address,address->len);
|
||||
memcpy(reply,(SOSockAddr*)address,address->len);
|
||||
request->vectors[2].base=(u8*)reply; request->vectors[2].length=address->len;
|
||||
result=IOS_Ioctlv(rm,12,1,2,request->vectors);
|
||||
if(result>=0) {
|
||||
memcpy(address,reply,address->len > reply->len ? reply->len : address->len);
|
||||
u32 bytes=address->len;
|
||||
memcpy(address,reply,bytes>reply->len?reply->len:bytes);
|
||||
}
|
||||
}
|
||||
if(result>=0 && direct == FALSE) memcpy(data,buffer,length);
|
||||
if(result>=0 && !direct) memcpy(data,buffer,length);
|
||||
}
|
||||
if(direct == FALSE) SOiFree(13,buffer,(length+31)&~31);
|
||||
if(!direct) SOiFree(13,buffer,(length+31)&~31);
|
||||
SOiFree(12,request,size);
|
||||
}
|
||||
result=SOiConclude(name,result);
|
||||
@@ -371,12 +350,11 @@ static int RecvFrom(const char* name, int socket, void* data, int length, int fl
|
||||
}
|
||||
|
||||
static int SendTo(const char* name, int socket, const void* data, int length, int flags, const SOSockAddr* address) {
|
||||
void* buffer;
|
||||
BOOL direct;
|
||||
int result;
|
||||
s32 rm;
|
||||
BOOL direct;
|
||||
void* buffer;
|
||||
SendRequest* request;
|
||||
SendCommand* command;
|
||||
if((result=SOiPrepare(name,&rm))==0) {
|
||||
if(address && (address->len>8 || address->len<8)) result=-28;
|
||||
else if(length<0 || (length>0 && !data)) result=-28;
|
||||
@@ -384,23 +362,23 @@ static int SendTo(const char* name, int socket, const void* data, int length, in
|
||||
direct=TRUE;
|
||||
if(length && !DirectBuffer(data,length)) direct=FALSE;
|
||||
request=SOiAlloc(12,96);
|
||||
if(direct == FALSE) buffer=SOiAlloc(14,(length+31)&~31);
|
||||
if(direct==0) buffer=SOiAlloc(14,(length+31)&~31);
|
||||
else buffer=(void*)data;
|
||||
if(!request || !buffer) result=-49;
|
||||
else {
|
||||
command = &request->command;
|
||||
command->socket=socket; command->flags=flags;
|
||||
if(!address) command->hasAddress=0;
|
||||
SendCmd* cmd=&request->command;
|
||||
cmd->socket=socket; cmd->flags=flags;
|
||||
if(!address) cmd->hasAddress=0;
|
||||
else {
|
||||
command->hasAddress=1;
|
||||
memcpy(&command->address,address,address->len);
|
||||
cmd->hasAddress=1;
|
||||
memcpy(&cmd->address,address,address->len);
|
||||
}
|
||||
if(direct == FALSE) memcpy(buffer,data,length);
|
||||
if(!direct) memcpy(buffer,data,length);
|
||||
request->vectors[0].base=buffer; request->vectors[0].length=length;
|
||||
request->vectors[1].base=(u8*)command; request->vectors[1].length=40;
|
||||
request->vectors[1].base=(u8*)cmd; request->vectors[1].length=40;
|
||||
result=IOS_Ioctlv(rm,13,2,0,request->vectors);
|
||||
}
|
||||
if(direct == FALSE) SOiFree(14,buffer,(length+31)&~31);
|
||||
if(!direct) SOiFree(14,buffer,(length+31)&~31);
|
||||
SOiFree(12,request,96);
|
||||
}
|
||||
result=SOiConclude(name,result);
|
||||
|
||||
53
netmisc.attempts.md
Normal file
53
netmisc.attempts.md
Normal file
@@ -0,0 +1,53 @@
|
||||
# netmisc leaf — attempt log (agent/w1005/netmisc)
|
||||
|
||||
DOL gate: units stay NonMatching → sha1 26116613f624061ba99c8d1a299aaa6efa85670d holds.
|
||||
|
||||
## This wave's wins
|
||||
- NHTTPi_compareTokenN_HdrRecvBuf: 126/124 -> 124/124 insn-equal (+66 regalloc/sched diffs).
|
||||
Lever: `if(position<limit){...} return -1;` wrap instead of `if(position>=limit) return -1;`
|
||||
early-return — makes the -1 return share the tail (same idiom as sibling fns in the TU).
|
||||
`int character` tried: regresses to 122/124 (drops needed extsb's) — orig uses `s8`.
|
||||
|
||||
## Open fns (all insn-equal unless noted) — documented walls
|
||||
- NHTTPi_compareToken (stdlib): 45/45, 8d. Web-color swap: base homes carried `leftByte`
|
||||
byte-web in r31 + rightChar-select in r12; mine inverts. `li r7,0x5a`/`li r9,0` order swap.
|
||||
Tried: leftLC-first body order (+r30 save, 47/45 revert), char/s8/u8 leftByte, (s8)*left /
|
||||
(int)leftByte / *left check operands, entry-hoisted `leftByte=...` before goto (inert),
|
||||
`(const s8*)` uniform typing (identical). Wall: which web wins the lone callee slot is
|
||||
allocator-internal; base's `extsb. r0,r31` needs the s8-typed shared web pinned r31 —
|
||||
every form either pins the wrong web (r31->rightChar) or breaks the carried-web CSE.
|
||||
- NHTTPi_strnicmp: 51/51, 2d. Pure `li` materialization order: base `li r9,0x5a` before
|
||||
`li r10,0`; mine swapped. The 0-web is the subfc/adde carry base for `>='A'`.
|
||||
Tried: conjunct swap in LowerCase (breaks the whole subfc/adde idiom -> 47/51),
|
||||
a/b lowercase order (12d), decl order a/b (20d). Wall: constant-web numbering.
|
||||
- NHTTPi_Base64Encode: 119/119, 58d. Insn-equal, unrolled-2x loop. Whole-iteration
|
||||
list-schedule interleave: base loads s0,s1 then computes; mine pulls s2 load forward.
|
||||
Tried: named c0/c1/c2 locals (+4 insns), operand-order `(s1>>4)+((s0&3)<<4)` (61d),
|
||||
`*output++` pointer form (identical 58d). Wall: list-scheduler priority.
|
||||
- SOGetSockName: 63/63, 3d. memcpy arg-marshal mr order: base r4,r5-load,r3; mine r3,r4,r5.
|
||||
Tried: reply-assign before socket store, `&request->address` direct, `size` as 3rd arg
|
||||
(still r5-copy at same slot). Wall: arg-copy scheduling.
|
||||
- SOGetInterfaceOpt: 119/119, 5d. level/option color rotation: base level->r26,option->r25;
|
||||
mine level->r25,option->r28. option-store-first flips option to r25 but swaps the two
|
||||
stw's emission order (3d, offsets right order wrong). Check-order/operand variants inert.
|
||||
Wall: arg-web coloring + store emit order can't both match from this source shape.
|
||||
- RecvFrom: 174/174, 65d. Uniform +1 arg-window shift (mine r24-r29 vs base r25-r30) —
|
||||
base pins one more callee web somewhere; "+1 pinned web" wall family.
|
||||
- SendTo: ~98% similar family (not diffed this wave).
|
||||
- md5 ProcessBlock: 306/306, 275d -> best 261d. Whole-fn web-coloring permutation.
|
||||
Decoded base's homes: block->r8, const->r9, word->r4, a->r0 (arithmetic-only web wins
|
||||
r0; r0 is ineligible as indexed-load base so word can't take it), b,c,d->r5,6,7.
|
||||
All-volatile allocation (only r29-31 callee). Moving state loads before/after pointer
|
||||
inits, stmt vs decl-init, `&block[*index++]` — allocator homes unchanged (block->r0 mine).
|
||||
Wall: which web is "first-created" for r0 is not driven by source order here.
|
||||
- aes AESiEncryptBlock: 158/158, ~134d; AESiDecryptBlock: 249/251 (-2 insns + big regalloc).
|
||||
Decrypt tail: base `xor r0,r5,r0; xor r0,r6,r0` before last stw — 4-term xor-tree
|
||||
reassociation differs; not yet decoded. Both fns are the same wholesale-color wall at
|
||||
larger scale (unrolled/flat straight-line code, no calls).
|
||||
- NHTTPi_compareTokenN_HdrRecvBuf residual: 124/124 insn-equal, 66d — "+1 callee web"
|
||||
family: base uses _savegpr_25 (pins char byte r25) + frame 0x30 vs mine _savegpr_26/0x20.
|
||||
|
||||
## Notes
|
||||
- Every remaining diff is insn-equal regalloc/scheduling/web-creation-order — the same
|
||||
allocator-internal family documented in nwc.attempts.md (waves 14-26) and linkgap.
|
||||
- No unit is single-fn-blocked; no unit at whole-100% -> no configure.py flips this wave.
|
||||
@@ -328,7 +328,7 @@ namespace ipl {
|
||||
return isSceneCreated();
|
||||
}
|
||||
|
||||
void SDButton::setEventHandler(::gui::EventHandler* event) {
|
||||
void SDButton::setEventHandler(::gui::EventHandler* event, ::gui::EventHandler* optOutEvent) {
|
||||
mpGui->setEventHandler(event);
|
||||
}
|
||||
|
||||
|
||||
@@ -282,7 +282,7 @@ FaderSceneCommand SDChannelTitle::calcFadein() {
|
||||
if (!mpFade->isPlaying()) {
|
||||
iplSDChannelTitle_playBannerIntro(this);
|
||||
SDButton* button = static_cast<SDButton*>(System::getScene(0x24));
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
button->setEventHandler(mpButtonEventHandler, NULL);
|
||||
button->animation(13);
|
||||
button->animation(14);
|
||||
mState = 1;
|
||||
@@ -344,7 +344,7 @@ void SDChannelTitle::initCalcFadeout() {
|
||||
button->animation(15);
|
||||
button->animation(16);
|
||||
}
|
||||
button->setEventHandler(NULL);
|
||||
button->setEventHandler(NULL, NULL);
|
||||
}
|
||||
|
||||
FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
# mslmisc leaf attempts
|
||||
|
||||
Owned units: `src/scene/sdChannelTitle/iplSDChannelTitle.cpp`, `libs/NW4R/src/ut/ut_ArchiveFontBase.cpp`.
|
||||
MSL checked via live report: only `MSL_Common/wprintf` incomplete — stays in misc1b's notes.
|
||||
|
||||
## DECODE: SDButton::setEventHandler retail dead-param (SOLVED)
|
||||
|
||||
orig's real decl was **1-arg** `setEventHandler(EventHandler*)`. Evidence:
|
||||
- Every orig call site (title ×2, select ×4) emits a bare `bl` with only r3/r4 — never `li r5,0`.
|
||||
- The 5-insn DEF (`lwz r3,0x60; lwz r12,0; lwz r12,0x38; mtctr; bctr`) forwards to `Manager::setEventHandler`, a 1-arg weak virtual — `optOut` was never consumed.
|
||||
- `Button::setEventHandler` (a DIFFERENT class, genuine 2-arg impl at 0x8139C93C) DOES emit `li r5,0` in iplFocusObject — MWCC materializes default args, so SDButton's missing r5 means the decl never had it.
|
||||
- The 2-arg mangle in symbols.txt was an author mislabel inherited from `Button`'s real 2-arg.
|
||||
|
||||
Fix (all kept): `iplSDButton.h` decl → `void setEventHandler(::gui::EventHandler* event);`; `iplSDButton.cpp` def → 1-arg; call sites in sdChannelTitle/sdChannelSelect → 1-arg; `config/43U/symbols.txt` line 4817 renamed `...8SDButtonFPQ23gui12EventHandlerPQ23gui12EventHandler` → `...8SDButtonFPQ23gui12EventHandler`. Flipped 5 fns to instruction-identical + all sdChannelTitle data sections to 100%.
|
||||
|
||||
Mechanism note: renaming a `.text` address in symbols.txt propagates through the splitter into orig's DEF name AND every caller's UND reloc name — the legit rename lever.
|
||||
|
||||
## UNSOLVED: enqueue*Notice leading dead-arg (r4)
|
||||
|
||||
`SDChannelSelect::enqueueChannelNotice(u32 controller, u32 page, u32 index, u32 value)` and
|
||||
`enqueueStateNotice(u32 controller, u32 state, u32 type, u32)` (4×u32 each; defs build
|
||||
`command.titleId = ((u64)page << 32) | index` — proven 4×u32, not u64).
|
||||
|
||||
orig call sites marshal r5/r6/r7 but **never write r4** (arg1 `controller` — dead param the
|
||||
def bodies ignore; iplSDMemory callers DO materialize it). Same dead-arg family as
|
||||
setEventHandler but on a LEADING arg — no decl form reproduces it:
|
||||
- arg-count reduction shifts the marshal left (breaks r5/r6/r7 positions)
|
||||
- defaulted params must be trailing
|
||||
- `(u32,u64,u32)` still needs `li r4,0` for arg1
|
||||
- `scene->mPage`/`mIndex`/`channel` as arg1 all emit real loads (`lwz`/`mr`) — orig has none
|
||||
- r4 is call-clobbered at both sites (`bl findChannelObject`, `bl isReceiveScheduleStopped`)
|
||||
so no "value already in r4" source expr exists
|
||||
|
||||
Residual = `+li r4,0` plus marshal-order (orig emits r6-before-r5 / addi-first) — scheduler family.
|
||||
|
||||
## TIE: flushSaveBeforeExit eval-order (98.59)
|
||||
|
||||
Insn+reloc-identical except a 6-word window: orig `lis r3` (smArg base→r3), `lwz r4,0x94` (stw-mgr),
|
||||
`stw`, `lwz r4,0x28` (heap), `lwz r3,0x94` (flush receiver — reloaded LAST). Mine: base→r4,
|
||||
receiver-load before heap-load. Orig evaluated the `flushAsync` ARG before the receiver reload.
|
||||
Tried: `saveHeap` local (before/after stw, decl-init, separate assign — emits at-birth or at-use,
|
||||
never between), `saveData`/`mgr` local (caches receiver → 5-insn form, wrong), nested
|
||||
`flushAsync(System::getMem2App())` (same as original). All ~6-word identical or regression.
|
||||
|
||||
## TIE: ConstructOpAnalyzeGLGR 20-diff window (91.79)
|
||||
|
||||
239/239 insns — orig interleaves `lhz r31,0x1c` (sheetGlyphCount) + `lhz r23,0xe` (dataBlockCount)
|
||||
mid-flag-chain (issued at birth, deep-callee homes); mine emits both at-use (`lhz r26/r25`,
|
||||
~8 insns later). Same callee-web rotation family. Kept: flags-first reorder (24→20 diffs) +
|
||||
the second `pGlgr = &font->glgr` assignment (removing it = 113 diffs). Decl-init variant no-op.
|
||||
|
||||
## Status
|
||||
|
||||
- iplSDChannelTitle: .text 99.9, all data sections 100% (baseline was data 12.1%). Three
|
||||
sub-100 fns — all at the anomalies/ties above.
|
||||
- ut_ArchiveFontBase: .text 98.5 — the 20-diff window.
|
||||
- DOL sha1 `26116613f624061ba99c8d1a299aaa6efa85670d` verified. No shims; both units stay NonMatching.
|
||||
Reference in New Issue
Block a user