Compare commits

...

1 Commits

Author SHA1 Message Date
coah
2a4eed45da odh/AOSS: small fuzzy gains (worker f272e078) 2026-09-30 22:24:49 +00:00
4 changed files with 365 additions and 121 deletions

View File

@@ -53,7 +53,7 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 98.73% | 86.01% | 59.99% | 90.87% |
| 98.74% | 86.01% | 59.99% | 90.87% |
units 871/1027 complete, functions 12118/12563 matched.

View File

@@ -133,6 +133,12 @@ typedef struct AOSSIncomingMessage {
AOSSPacketPayload payload;
} AOSSIncomingMessage;
typedef struct AOSSEncryptedPayload {
u16 dataLength;
u16 keyNonce;
u8 data[0x5c0];
} AOSSEncryptedPayload;
typedef struct AOSSDecryptionMessage {
u8 reserved00[6];
u16 command;
@@ -143,11 +149,7 @@ typedef struct AOSSDecryptionMessage {
u8 messageType;
u8 manufacturerAddress[8];
union {
struct {
u16 dataLength;
u16 keyNonce;
u8 data[0x5c0];
} encrypted;
AOSSEncryptedPayload encrypted;
u8 bytes[0x5c4];
} payload;
} AOSSDecryptionMessage;
@@ -1841,6 +1843,7 @@ int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestR
}
int AOSS_81400830(AOSSDecryptionMessage* message) {
AOSSEncryptedPayload* encrypted = &message->payload.encrypted;
u8 manufacturerAddress[8];
AOSSKeySchedule schedule;
u8* decryptedData;
@@ -1853,8 +1856,10 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
u32 secondIndex;
u32 firstValue;
u32 secondValue;
u32 stateIndex;
u32 crc;
u8* outputCursor;
u8* state;
const u8* inputCursor;
int result;
@@ -1880,7 +1885,7 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
return 0;
}
dataLength = SONtoHs(message->payload.encrypted.dataLength);
dataLength = SONtoHs(encrypted->dataLength);
decryptedData = AOSSi_Alloc(dataLength);
if (decryptedData == 0) {
s_errorCode = 2;
@@ -1893,27 +1898,29 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
s_errorCode = 2;
result = -1;
} else {
memcpy(s_packetState.keyNonce, &message->payload.encrypted.keyNonce, sizeof(message->payload.encrypted.keyNonce));
memcpy(s_packetState.keyNonce, &encrypted->keyNonce, sizeof(encrypted->keyNonce));
memcpy(s_packetState.keyAddress, s_accessPointName, sizeof(s_accessPointName));
AOSS_81401C9C(&schedule, s_packetState.keyNonce,
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), dataLength);
outputCursor = decryptedData;
inputCursor = message->payload.encrypted.data;
inputCursor = encrypted->data;
for (i = 0; i < dataLength; i++) {
state = schedule.bytes;
firstIndex = ((schedule.i + 1) % schedule.length) & 0xff;
firstValue = schedule.bytes[firstIndex];
firstValue = state[firstIndex];
secondIndex = ((firstValue + schedule.j) % schedule.length) & 0xff;
secondValue = schedule.bytes[secondIndex];
secondValue = state[secondIndex];
stateIndex = firstValue + secondValue;
schedule.i = firstIndex;
schedule.j = secondIndex;
schedule.bytes[secondIndex] = (u8)firstValue;
schedule.bytes[firstIndex] = (u8)secondValue;
*outputCursor++ = schedule.bytes[(firstValue + secondValue) % schedule.length] ^ *inputCursor++;
state[secondIndex] = (u8)firstValue;
state[firstIndex] = (u8)secondValue;
*outputCursor++ = *inputCursor++ ^ state[stateIndex % schedule.length];
}
AOSS_81401DC0(0, s_crcTable);
crc = 0xffffffff;
AOSS_81401DC0(0, s_crcTable);
for (crcIndex = 0; crcIndex < (s32)dataLength; crcIndex++) {
crc = (crc >> 8) ^ s_crcTable[(crc ^ decryptedData[crcIndex]) & 0xff];
}
@@ -1932,7 +1939,7 @@ int AOSS_81400830(AOSSDecryptionMessage* message) {
return s_errorCode == 2 ? 100 : 200;
}
memcpy(message->payload.bytes, decryptedData, dataLength);
memcpy(encrypted, decryptedData, dataLength);
message->outputLength = SOHtoNs(dataLength);
AOSSi_Free(decryptedData);
return 0;
@@ -2311,6 +2318,7 @@ int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket) {
int AOSS_81401778(void* packet, void* request, int socket) {
AOSSHelloPacket* response = (AOSSHelloPacket*)s_responseBuffer;
AOSSHelloPayload* payload = &response->payload;
AOSSRequestRecords* requestRecords = (AOSSRequestRecords*)request;
AOSSSocketAddress destination;
AOSSKeySchedule schedule;
@@ -2342,8 +2350,8 @@ int AOSS_81401778(void* packet, void* request, int socket) {
if ((s32)s_connectionState == 1) {
sequence = 1;
AOSS_81401DC0(0, s_crcTable);
crc = 0xffffffff;
AOSS_81401DC0(0, s_crcTable);
crc = (crc >> 8) ^ s_crcTable[(crc ^ hello.data.bytes[0]) & 0xff];
crc = (crc >> 8) ^ s_crcTable[(crc ^ hello.data.bytes[1]) & 0xff];
crc = (crc >> 8) ^ s_crcTable[(crc ^ hello.data.bytes[2]) & 0xff];
@@ -2357,8 +2365,8 @@ int AOSS_81401778(void* packet, void* request, int socket) {
schedule.bytes = (u8*)AOSSi_Alloc(8);
if (schedule.bytes != 0) {
nonce = (u16)rand();
memcpy(&response->payload.encrypted.key.nonce, &nonce, 2);
memcpy(s_packetState.keyNonce, response->payload.encrypted.key.nonceBytes, 2);
memcpy(&payload->encrypted.key.nonce, &nonce, 2);
memcpy(s_packetState.keyNonce, payload->encrypted.key.nonceBytes, 2);
memcpy(s_packetState.keyAddress, s_accessPointName, 8);
AOSS_81401C9C(&schedule, s_packetState.keyNonce,
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), 8);
@@ -2371,14 +2379,14 @@ int AOSS_81401778(void* packet, void* request, int socket) {
schedule.bytes[schedule.j] = (u8)firstByte;
schedule.bytes[schedule.i] = swap;
value = schedule.bytes[stateLength % schedule.length] ^ hello.data.bytes[index];
response->payload.bytes[index + 4] = value;
payload->bytes[index + 4] = value;
}
AOSSi_Free(schedule.bytes);
}
response->payload.encrypted.length = SOHtoNs(8);
payload->encrypted.length = SOHtoNs(8);
responseLength = 0x0c;
} else {
memcpy(response->payload.bytes, &hello, 8);
memcpy(payload->bytes, &hello, 8);
}
memcpy(accessPointName, &requestRecords->records[1], 8);

View File

@@ -32,8 +32,7 @@ struct SArDeconvTbl {
};
struct SArCDJ_HuffmanRequest {
u32* dcPredictor;
u32* acPredictor;
u32* predictors[2];
u32* dcTable;
u32* acTable;
u8* bitstream;
@@ -761,8 +760,8 @@ s32 CArGBAOdh::cdj_c_initializeCompressOdh(SArCDJ_OdhMaster* master, u16* dimens
master->blocksWide = (s32)dimensionMinusOne / 8 + 1;
dimensionMinusOne = dimensions[1] - 1;
master->blocksHigh = (s32)dimensionMinusOne / 8 + 1;
master->luminanceRequest.dcPredictor = &master->field20;
master->luminanceRequest.acPredictor = &master->field20;
master->luminanceRequest.predictors[0] = &master->field20;
master->luminanceRequest.predictors[1] = &master->field20;
master->luminanceRequest.dcTable = (u32*)gArDC_L_Table;
master->luminanceRequest.acTable = (u32*)gArDC_L_Table;
master->luminanceRequest.bitstream = outputBuffer;
@@ -770,8 +769,8 @@ s32 CArGBAOdh::cdj_c_initializeCompressOdh(SArCDJ_OdhMaster* master, u16* dimens
master->luminanceRequest.bitBuffer = &master->bitBuffer;
master->luminanceRequest.bitCount = &master->bitCount;
master->luminanceRequest.bytesConsumed = outputCapacity;
master->chrominanceRequest.dcPredictor = &master->field24;
master->chrominanceRequest.acPredictor = &master->field28;
master->chrominanceRequest.predictors[0] = &master->field24;
master->chrominanceRequest.predictors[1] = &master->field28;
master->chrominanceRequest.dcTable = (u32*)gArDC_C_Table;
master->chrominanceRequest.acTable = (u32*)gArDC_L_Table;
master->chrominanceRequest.bitstream = outputBuffer;
@@ -922,11 +921,11 @@ void CArGBAOdh::cdj_c_setQuantizationTable(SArCDJ_OdhMaster* master, u32 quality
for (int i = 0; i < 0x40; i++) {
u32 scale = scales[scaleIndex];
u8 coefficient = quantizationRow[i];
master->quantizationTables[tablePass * 64 + i] = 0x4000000 / (scale * (u32)coefficient);
master->quantizationTables[tableOffset + i] = 0x4000000 / (scale * (u32)coefficient);
scaleIndex++;
}
tablePass = tablePass + 1;
tableOffset = tableOffset + 0x100;
tableOffset = tableOffset + 0x40;
scaledTableOffset = scaledTableOffset + 0x40;
} while (tablePass < 2);
}
@@ -1075,83 +1074,81 @@ void CArGBAOdh::fdct_fast(u32* coefficients, u8* samples, u32 stride, u32* quant
}
int* buffer = (int*)coefficients;
int butterflyValueA = 0;
int butterflyValueB = 0;
for (int row = 0; row < 8; row++) {
int evenSum = *buffer + buffer[7];
int evenDifference = *buffer - buffer[7];
int oddDifference = buffer[1] - buffer[6];
int butterflyValueB = buffer[1] + buffer[6];
int oddSum = buffer[2] - buffer[5];
int middleSum = oddDifference + evenDifference;
int butterflyValueA = buffer[2] + buffer[5];
int innerSum = buffer[3] + buffer[4];
int outerSum = butterflyValueB + butterflyValueA;
int oddBranch = (buffer[3] - buffer[4]) + oddSum;
int crossTerm = evenSum - innerSum;
evenSum = evenSum + innerSum;
*buffer = evenSum + outerSum;
buffer[4] = evenSum - outerSum;
butterflyValueB = ((butterflyValueB - butterflyValueA) + crossTerm) * 0xB5 >> 8;
buffer[2] = crossTerm + butterflyValueB;
butterflyValueA = (oddBranch - middleSum) * 0x62 >> 8;
buffer[6] = crossTerm - butterflyValueB;
oddBranch = butterflyValueA + (oddBranch * 0x8B >> 8);
butterflyValueA = butterflyValueA + (middleSum * 0x14E >> 8);
butterflyValueB = (oddSum + oddDifference) * 0xB5 >> 8;
oddDifference = evenDifference - butterflyValueB;
evenDifference = evenDifference + butterflyValueB;
buffer[5] = oddDifference + oddBranch;
buffer[3] = oddDifference - oddBranch;
buffer[1] = evenDifference + butterflyValueA;
buffer[7] = evenDifference - butterflyValueA;
int sum07 = buffer[0] + buffer[7];
int difference07 = buffer[0] - buffer[7];
int difference16 = buffer[1] - buffer[6];
int sum16 = buffer[1] + buffer[6];
int difference25 = buffer[2] - buffer[5];
int sum25 = buffer[2] + buffer[5];
int sum34 = buffer[3] + buffer[4];
int difference34 = buffer[3] - buffer[4];
int oddLower = difference34 + difference25;
int oddMiddle = difference25 + difference16;
int oddUpper = difference16 + difference07;
int evenOuterSum = sum07 + sum34;
int evenOuterDifference = sum07 - sum34;
int evenInnerSum = sum16 + sum25;
int evenInnerDifference = sum16 - sum25;
buffer[0] = evenOuterSum + evenInnerSum;
buffer[4] = evenOuterSum - evenInnerSum;
int evenRotation = (evenInnerDifference + evenOuterDifference) * 181 >> 8;
buffer[2] = evenOuterDifference + evenRotation;
buffer[6] = evenOuterDifference - evenRotation;
int oddRotation = (oddLower - oddUpper) * 98 >> 8;
int oddLeft = (oddLower * 139 >> 8) + oddRotation;
int oddRight = (oddUpper * 334 >> 8) + oddRotation;
int oddCenter = oddMiddle * 181 >> 8;
int oddSum = difference07 + oddCenter;
int oddDifference = difference07 - oddCenter;
buffer[5] = oddDifference + oddLeft;
buffer[3] = oddDifference - oddLeft;
buffer[1] = oddSum + oddRight;
buffer[7] = oddSum - oddRight;
buffer += 8;
}
buffer = (int*)coefficients;
for (int column = 0; column < 8; column++) {
int evenSum = *buffer + buffer[0x38];
int outerSum = *buffer - buffer[0x38];
int oddDifference = buffer[8] - buffer[0x30];
int butterflyValueB = buffer[8] + buffer[0x30];
int innerSum = buffer[0x10] - buffer[0x28];
int butterflyValueA = buffer[0x10] + buffer[0x28];
int evenDifference = oddDifference + outerSum;
int oddBranch = buffer[0x18] + buffer[0x20];
int middleSum = evenSum - oddBranch;
int crossTerm = (buffer[0x18] - buffer[0x20]) + innerSum;
int oddSum = butterflyValueB + butterflyValueA;
evenSum = evenSum + oddBranch;
*buffer = evenSum + oddSum;
buffer[0x20] = evenSum - oddSum;
butterflyValueB = ((butterflyValueB - butterflyValueA) + middleSum) * 0xB5 >> 8;
buffer[0x10] = middleSum + butterflyValueB;
butterflyValueA = (crossTerm - evenDifference) * 0x62 >> 8;
buffer[0x30] = middleSum - butterflyValueB;
oddBranch = butterflyValueA + (crossTerm * 0x8B >> 8);
butterflyValueA = butterflyValueA + (evenDifference * 0x14E >> 8);
butterflyValueB = (innerSum + oddDifference) * 0xB5 >> 8;
evenDifference = outerSum - butterflyValueB;
outerSum = outerSum + butterflyValueB;
buffer[0x28] = evenDifference + oddBranch;
buffer[0x18] = evenDifference - oddBranch;
buffer[8] = outerSum + butterflyValueA;
buffer[0x38] = outerSum - butterflyValueA;
int sum07 = buffer[0] + buffer[56];
int difference07 = buffer[0] - buffer[56];
int sum16 = buffer[8] + buffer[48];
int difference16 = buffer[8] - buffer[48];
int sum25 = buffer[16] + buffer[40];
int difference25 = buffer[16] - buffer[40];
int sum34 = buffer[24] + buffer[32];
int difference34 = buffer[24] - buffer[32];
int oddLower = difference34 + difference25;
int oddMiddle = difference25 + difference16;
int oddUpper = difference16 + difference07;
int evenOuterSum = sum07 + sum34;
int evenOuterDifference = sum07 - sum34;
int evenInnerSum = sum16 + sum25;
int evenInnerDifference = sum16 - sum25;
buffer[0] = evenOuterSum + evenInnerSum;
buffer[32] = evenOuterSum - evenInnerSum;
int evenRotation = (evenInnerDifference + evenOuterDifference) * 181 >> 8;
buffer[16] = evenOuterDifference + evenRotation;
buffer[48] = evenOuterDifference - evenRotation;
int oddRotation = (oddLower - oddUpper) * 98 >> 8;
int oddLeft = (oddLower * 139 >> 8) + oddRotation;
int oddRight = (oddUpper * 334 >> 8) + oddRotation;
int oddCenter = oddMiddle * 181 >> 8;
int oddSum = difference07 + oddCenter;
int oddDifference = difference07 - oddCenter;
buffer[40] = oddDifference + oddLeft;
buffer[24] = oddDifference - oddLeft;
buffer[8] = oddSum + oddRight;
buffer[56] = oddSum - oddRight;
buffer++;
}
int* coefficientColumn = (int*)coefficients;
int* quantizationColumn = (int*)quantizationTable;
for (int columnIndex = 0; columnIndex < 8; columnIndex++) {
int* coefficientCursor = coefficientColumn;
int* quantizationCursor = quantizationColumn;
s32* inputColumn = (s32*)coefficients + columnIndex;
s32* quantizationColumn = (s32*)quantizationTable + columnIndex;
for (int rowIndex = 0; rowIndex < 8; rowIndex++) {
*coefficientCursor = (*coefficientCursor * *quantizationCursor + 16384) >> 0xF;
coefficientCursor += 8;
quantizationCursor += 8;
inputColumn[rowIndex * 8] = (inputColumn[rowIndex * 8] * quantizationColumn[rowIndex * 8] + 16384) >> 15;
}
coefficientColumn++;
quantizationColumn++;
}
}
@@ -1161,7 +1158,7 @@ s32 CArGBAOdh::huffmanCoder(u16* coefficientInput, SArCDJ_HuffmanRequest* reques
this->outputCursor = request->bitstream + (request->bytesConsumed - *request->remaining);
while (true) {
u32* predictor = isAcBlock == 0 ? request->dcPredictor : request->acPredictor;
u32* predictor = request->predictors[isAcBlock];
u16* nextCoefficient = inputCursor + 2;
u32 rawValue = (u32)*inputCursor << 16;
s32 currentValue = (s32)rawValue >> 16;
@@ -1344,13 +1341,13 @@ s32 CArGBAOdh::cdj_d_initializeDecompressOdh(SArCDJ_OdhMaster* master, u8* workB
master->field20 = 0;
master->field24 = 0;
master->field28 = 0;
master->luminanceRequest.dcPredictor = &master->field20;
master->luminanceRequest.acPredictor = &master->field20;
master->luminanceRequest.predictors[0] = &master->field20;
master->luminanceRequest.predictors[1] = &master->field20;
master->luminanceRequest.bitstream = sourceData;
master->luminanceRequest.bitCount = &master->bitCount;
master->luminanceRequest.bytesConsumed = 0x10;
master->chrominanceRequest.dcPredictor = &master->field24;
master->chrominanceRequest.acPredictor = &master->field28;
master->chrominanceRequest.predictors[0] = &master->field24;
master->chrominanceRequest.predictors[1] = &master->field28;
master->chrominanceRequest.bitstream = sourceData;
master->chrominanceRequest.bitCount = &master->bitCount;
master->chrominanceRequest.bytesConsumed = 0x10;
@@ -1385,6 +1382,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
int planeOffset;
int blockRowSize;
int naturalIndex;
int requiredBlockEnd;
blockWidth = master->blocksWide;
blockRowSize = (u32)blockWidth * 0x38;
@@ -1463,7 +1461,8 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
}
planeOffset = (u32)master->blockX * 0x10 +
((u32)master->blockY << 6) * (u32)master->blocksWide * 2;
if (planeOffset + blockRowStride + 8 > workBufferSize) {
requiredBlockEnd = planeOffset + blockRowStride + 8;
if (requiredBlockEnd > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
}
@@ -1479,7 +1478,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
if (planeOffset + blockRowStride + 0x10 > workBufferSize) {
if (requiredBlockEnd + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
}
@@ -1608,7 +1607,8 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
}
planeOffset = (u32)master->blockX * 0x10 +
((u32)master->blockY << 6) * (u32)master->blocksWide * 4;
if (planeOffset + blockRowStride + 8 > workBufferSize) {
requiredBlockEnd = planeOffset + blockRowStride + 8;
if (requiredBlockEnd > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
}
@@ -1641,7 +1641,8 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
planeOffset = planeOffset + (u32)master->blocksWide * 0x80 + -8;
if (planeOffset + blockRowStride + 8 > workBufferSize) {
requiredBlockEnd = planeOffset + blockRowStride + 8;
if (requiredBlockEnd > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
}
@@ -1657,7 +1658,7 @@ s32 CArGBAOdh::cdj_d_decompressLoop(SArCDJ_OdhMaster* master, int srcSize, int w
coefficientIndex = odh_natural_order[naturalIndex];
master->coefficients[coefficientIndex] = master->dcCoefficients[naturalIndex];
}
if (planeOffset + blockRowStride + 0x10 > workBufferSize) {
if (requiredBlockEnd + 8 > workBufferSize) {
statusOrOffset = -0x7ffffffa;
goto finishBlock;
}
@@ -1718,7 +1719,7 @@ finishBlock:
void CArGBAOdh::cdj_d_setDequantizationTable(SArCDJ_OdhMaster* master, u32 qualityScale) {
const u16* scales = (const u16*)gArAANScales;
int tableByteOffset = 0;
int quantizationOffset = 0;
int standardTableOffset = 0;
u32 tablePass = 0;
int scaleIndex;
@@ -1743,13 +1744,13 @@ void CArGBAOdh::cdj_d_setDequantizationTable(SArCDJ_OdhMaster* master, u32 quali
scaleIndex = tableIndex;
u32 scale = scales[scaleIndex];
u32 value = (boundedCoefficient * scale + 2048) >> 0xC;
u32* destination = master->quantizationTables + tablePass * 64;
u32* destination = master->quantizationTables + quantizationOffset;
destination[tableIndex] = value;
tableIndex++;
standardTable++;
}
tablePass++;
tableByteOffset += 0x100;
quantizationOffset += 0x40;
standardTableOffset += 0x40;
} while (tablePass < 2);
}
@@ -1913,10 +1914,10 @@ void CArGBAOdh::LineDeconv21(u8* dest, u8* y, u8* cb, u8* cr, u16 width, u16 hei
if (format == 0) {
outputOffset = (pixelIndex & 0x1FFFFFFC) * 8 + (pixelIndex & 3) * 2;
redValue = ((redValue & 0xF8) << 8 | (greenValue & 0xFC) << 3) | (blueValue >> 3);
s32 packedPixel = ((redValue & 0xF8) << 8 | (greenValue & 0xFC) << 3) | (blueValue >> 3);
dest[outputOffset] = packedPixel >> 8;
pixelOutput = dest + outputOffset;
pixelOutput[0] = redValue >> 8;
pixelOutput[1] = redValue;
pixelOutput[1] = packedPixel;
} else if (format == 1) {
outputOffset = (pixelIndex & 0x0FFFFFFC) * 0x10 + (pixelIndex & 3) * 2;
pixelOutput = dest + outputOffset;
@@ -1937,9 +1938,9 @@ void CArGBAOdh::LineDeconv21(u8* dest, u8* y, u8* cb, u8* cr, u16 width, u16 hei
blueValue = ScaleLimit((u32)lumaValue + table->blue[cbValue]);
if (format == 0) {
redValue = ((redValue & 0xF8) << 8 | (greenValue & 0xFC) << 3) | (blueValue >> 3);
pixelOutput[2] = redValue >> 8;
pixelOutput[3] = redValue;
s32 packedPixel = ((redValue & 0xF8) << 8 | (greenValue & 0xFC) << 3) | (blueValue >> 3);
pixelOutput[2] = packedPixel >> 8;
pixelOutput[3] = packedPixel;
} else if (format == 1) {
pixelOutput[2] = 0xFF;
pixelOutput[3] = redValue;
@@ -2183,7 +2184,8 @@ s32 CArGBAOdh::huffmanDecoder(u32* coefficientOutput, SArCDJ_HuffmanRequest* req
tableIndex = tableIndex + decodedSymbol;
} else {
if ((tableEntry & 0x4000) != 0) {
valueCategory = huffmanTables[0][tableIndex + decodedSymbol + 1];
u32 leafIndex = tableIndex + decodedSymbol + 1;
valueCategory = huffmanTables[0][leafIndex];
break;
}
tableIndex = tableIndex + decodedSymbol + 1;
@@ -2201,14 +2203,15 @@ s32 CArGBAOdh::huffmanDecoder(u32* coefficientOutput, SArCDJ_HuffmanRequest* req
} else {
bitBuffer = 0;
}
u32* predictor = component == 2 ? request->acPredictor : request->dcPredictor;
u32** predictors = request->predictors;
u32* predictor = predictors[component >> 1];
bitCountAndMask = bitOffset + bitIndex + valueCategory;
tableIndex = (u32)(bitCountAndMask >> 3);
decodedSymbol = 1;
bitIndex = (int)bitBuffer + *predictor;
*coefficientOutput = bitIndex;
*predictor = bitIndex;
for (u32 byteIndex = 0; byteIndex < tableIndex; byteIndex++) {
*predictors[component >> 1] = bitIndex;
while (bitCountAndMask >= 8) {
sourceCursor++;
bytesConsumed++;
bitCountAndMask -= 8;
@@ -2248,7 +2251,7 @@ s32 CArGBAOdh::huffmanDecoder(u32* coefficientOutput, SArCDJ_HuffmanRequest* req
if (valueCategory == 7) {
bitCountAndMask += bitIndex;
tableIndex = (u32)(bitCountAndMask >> 3);
for (u32 byteIndex = 0; byteIndex < tableIndex; byteIndex++) {
while (bitCountAndMask >= 8) {
sourceCursor++;
bytesConsumed++;
bitCountAndMask -= 8;
@@ -2271,7 +2274,7 @@ s32 CArGBAOdh::huffmanDecoder(u32* coefficientOutput, SArCDJ_HuffmanRequest* req
}
bitCountAndMask = bitCountAndMask + bitIndex + valueCategory;
tableIndex = (u32)(bitCountAndMask >> 3);
for (u32 byteIndex = 0; byteIndex < tableIndex; byteIndex++) {
while (bitCountAndMask >= 8) {
sourceCursor++;
bytesConsumed++;
bitCountAndMask -= 8;
@@ -2323,7 +2326,7 @@ s32 CArGBAOdh::huffmanDecoder(u32* coefficientOutput, SArCDJ_HuffmanRequest* req
coefficientOutput[decodedSymbol] = bitBuffer;
tableIndex = (u32)(bitCountAndMask >> 3);
decodedSymbol = decodedSymbol + 1;
for (u32 byteIndex = 0; byteIndex < tableIndex; byteIndex++) {
while (bitCountAndMask >= 8) {
sourceCursor++;
bytesConsumed++;
bitCountAndMask -= 8;

View File

@@ -0,0 +1,233 @@
# odh and AOSS matching attempts
Partial progress only. Full gate passes; instruction-exact counts and matched code bytes did not increase. No configure.py linking changes.
## src/system/odh
| Function | Target bytes | Before % | After % | Remaining difference |
|---|---:|---:|---:|---|
| cdj_c_setQuantizationTable | 280 | 93.97143 | 94.14286 | 70/70 instructions; remaining register choices. |
| cdj_c_colorConv | 308 | 97.40260 | 97.40260 | 77/77 instructions; remaining register choices. |
| LineConv11 | 584 | 80.74657 | 80.74657 | 146/146 instructions; float operation scheduling/register choices; constant-pool regression candidate rejected. |
| fdct_fast | 676 | 78.30769 | 89.78107 | 169/169 instructions; pair-load and butterfly scheduling. |
| huffmanCoder | 652 | 91.96319 | 96.50307 | 163/163 instructions; initial cursor addition scheduling and register choices. |
| cdj_d_decompressLoop | 3596 | 97.68409 | 97.45273 | 899/899 instructions; remaining register choices. |
| cdj_d_setDequantizationTable | 204 | 94.60784 | 94.84314 | 51/51 instructions; inner-loop increment scheduling. |
| LineDeconv21 | 560 | 92.61429 | 92.65000 | 145/140 instructions; larger frame and spilled green-table pointer. |
| LineDeconv12 | 584 | 83.47260 | 83.47260 | 146/146 instructions; component/output scheduling. |
| LineDeconv22 | 976 | 96.43443 | 96.43443 | 244/244 instructions; first pixel offset/blue shift scheduling. |
| huffmanDecoder | 1224 | 91.04902 | 94.93464 | 306/306 instructions; remaining register choices. |
| idct_fast | 948 | 70.49789 | 70.49789 | 236/237 instructions; frame/register pressure and butterfly scheduling. |
### Attempts
#### cdj_c_setQuantizationTable
- explicit output table index: 94.14286%; instructions 70/70; 0 differences after register-number normalization.
- increment input row first: 93.97143%; instructions 70/70; 2 differences after register-number normalization.
- unsigned inner scale index: 93.97143%; instructions 70/70; 2 differences after register-number normalization.
- separate output pass from scale pass: 94.14286%; instructions 70/70; 0 differences after register-number normalization.
- walk standard and scaled quantization pointers: 89.90000%; instructions 68/70; 54 differences after register-number normalization.
- use counted scale pass loop: 94.14286%; instructions 70/70; 0 differences after register-number normalization.
#### cdj_c_colorConv
- signed row loop: 97.40260%; instructions 77/77; 0 differences after register-number normalization.
- add source before row offset: 97.40260%; instructions 77/77; 0 differences after register-number normalization.
- signed padded width: 97.40260%; instructions 77/77; 0 differences after register-number normalization.
- name padded plane size: 97.40260%; instructions 77/77; 0 differences after register-number normalization.
- promote height before conversion loops: 97.40260%; instructions 77/77; 0 differences after register-number normalization.
- read conversion height after plane setup: 97.40260%; instructions 77/77; 0 differences after register-number normalization.
#### LineConv11
- read conversion constants at use: 80.88356%; instructions 146/146; 40 differences after register-number normalization.
- reuse output channel values across clamp: 80.47260%; instructions 146/146; 40 differences after register-number normalization.
- name input chroma planes: 80.47260%; instructions 146/146; 40 differences after register-number normalization.
#### fdct_fast
- canonical row butterflies: 77.27811%; instructions 169/169; 41 differences after register-number normalization.
- index quantization columns: 81.72189%; instructions 167/169; 38 differences after register-number normalization.
- canonical column butterflies: 85.30769%; instructions 167/169; 29 differences after register-number normalization.
- separate quantization column bases: 88.86391%; instructions 169/169; 14 differences after register-number normalization.
- differences before pair sums: 88.86391%; instructions 169/169; 14 differences after register-number normalization.
- compute odd sums before even outputs: 89.78107%; instructions 169/169; 15 differences after register-number normalization.
#### huffmanCoder
- index component predictors: 96.50307%; instructions 163/163; 3 differences after register-number normalization.
- single coefficient cursor through blocks: 96.25767%; instructions 163/163; 3 differences after register-number normalization.
- use typed initial coefficient cursor: 96.25767%; instructions 163/163; 3 differences after register-number normalization.
- signed huffman code words: 96.25767%; instructions 163/163; 3 differences after register-number normalization.
#### cdj_d_decompressLoop
- unsigned strides: 97.32814%; instructions 899/899; 8 differences after register-number normalization.
- promote block width: 97.68409%; instructions 899/899; 2 differences after register-number normalization.
- factor row bounds: 97.45273%; instructions 899/899; 0 differences after register-number normalization.
#### cdj_d_setDequantizationTable
- explicit dequantization table index: 94.84314%; instructions 51/51; 3 differences after register-number normalization.
- clamp unsigned coefficient directly: 94.84314%; instructions 51/51; 3 differences after register-number normalization.
- separate scale and output cursors: 81.64706%; instructions 51/51; 21 differences after register-number normalization.
#### LineDeconv21
- separate packed rgb565 value: 92.61429%; instructions 145/140; 108 differences after register-number normalization.
- indexed first rgb565 store: 92.65000%; instructions 145/140; 108 differences after register-number normalization.
- signed pixel loop index: 92.65000%; instructions 145/140; 108 differences after register-number normalization.
- load cr green before cb green: 92.61429%; instructions 145/140; 108 differences after register-number normalization.
#### LineDeconv12
- load cr green first: 83.47260%; instructions 146/146; 99 differences after register-number normalization.
- index first packed store: 83.47260%; instructions 146/146; 99 differences after register-number normalization.
- separate tiled offset sum: 83.47260%; instructions 146/146; 99 differences after register-number normalization.
#### LineDeconv22
- sum tiled offsets before destination: 96.43443%; instructions 244/244; 2 differences after register-number normalization.
- associate tiled offset: 96.43443%; instructions 244/244; 2 differences after register-number normalization.
- name rgb565 packed channels: 94.07787%; instructions 244/244; 7 differences after register-number normalization.
- separate tiled column: 96.31148%; instructions 244/244; 3 differences after register-number normalization.
#### huffmanDecoder
- index predictors and reload destination: 93.97385%; instructions 306/306; 11 differences after register-number normalization.
- name first right leaf index: 94.74183%; instructions 306/306; 8 differences after register-number normalization.
- advance bytes while remaining bits exceed byte: 94.93464%; instructions 306/306; 0 differences after register-number normalization.
#### idct_fast
- load even pair before odd pair: 70.49789%; instructions 236/237; 130 differences after register-number normalization.
- retranslate column products and butterflies: 66.42194%; instructions 236/237; 129 differences after register-number normalization.
- compute even rotation before odd products: 65.50211%; instructions 236/237; 135 differences after register-number normalization.
- signed transform workspace and sums: 70.49789%; instructions 236/237; 130 differences after register-number normalization.
## src/scene/setting/AOSS
| Function | Target bytes | Before % | After % | Remaining difference |
|---|---:|---:|---:|---|
| AOSS_Init_old | 6336 | 73.34911 | 73.34911 | 1494/1584 instructions; stack frame, poll records and omitted branch path; target r14 initialization unresolved. |
| AOSS_81400830 | 1284 | 93.84112 | 97.04050 | 321/321 instructions; register choices and two ctxdiff CR1 branch operand decoding discrepancies. |
| AOSS_81400E0C | 760 | 100.00000 | 100.00000 | 190/190 instructions; objdiff 100; ctxdiff CR1 branch decoding uses wrong operand and depends on preceding function sizes. |
| AOSS_814013AC | 456 | 98.77193 | 98.77193 | 114/114 instructions; remaining cursor/length register choices. |
| AOSS_81401778 | 1092 | 79.16483 | 80.16849 | 276/273 instructions; global base lifetime, initial checksum folding and encryption loop scheduling. |
| AOSS_81401E80 | 588 | 98.60545 | 98.60545 | 147/147 instructions; XOR result/base register choices and two ctxdiff CR1 branch decoding discrepancies. |
### Attempts
#### AOSS_Init_old
- retranslate poll descriptors and align request records: 69.44571%; instructions 1551/1584; 1412 differences after register-number normalization.
- retranslate signed wait arrays and timeout pair: 64.67929%; instructions 1603/1584; 1471 differences after register-number normalization.
- align bound socket address: 64.68056%; instructions 1603/1584; 1470 differences after register-number normalization.
- two complete descriptors and copied gateway: 72.99811%; instructions 1498/1584; 1438 differences after register-number normalization.
- align complete socket address: 69.45644%; instructions 1553/1584; 1403 differences after register-number normalization.
#### AOSS_81400830
- retain encrypted payload pointer: 93.84112%; instructions 326/321; 277 differences after register-number normalization.
- name rc4 state sum before swap: 93.84112%; instructions 326/321; 277 differences after register-number normalization.
- encrypted byte first xor operand: 93.84112%; instructions 326/321; 277 differences after register-number normalization.
- retain payload through final memcpy: 93.98131%; instructions 327/321; 204 differences after register-number normalization.
- hold rc4 state pointer during each swap: 96.28661%; instructions 321/321; 6 differences after register-number normalization.
- initialize crc before table call: 97.04050%; instructions 321/321; 2 differences after register-number normalization.
#### AOSS_81400E0C
Already objdiff-exact; no source change. Apparent ctxdiff disagreement is described below.
#### AOSS_814013AC
- reuse record cursor after outer option: 96.18421%; instructions 114/114; 2 differences after register-number normalization.
- delay remaining length initialization: 96.18421%; instructions 114/114; 2 differences after register-number normalization.
- initialize option flags after length guard: 94.47369%; instructions 114/114; 7 differences after register-number normalization.
- preserve state argument before copying response length: 94.38596%; instructions 114/114; 7 differences after register-number normalization.
- compute network record before config fields: 93.94737%; instructions 114/114; 7 differences after register-number normalization.
- reuse response length argument for inner record: 98.20175%; instructions 114/114; 0 differences after register-number normalization.
- reuse response argument and record cursor: 97.58772%; instructions 114/114; 0 differences after register-number normalization.
- compute network destination before config pointers: 95.48245%; instructions 114/114; 2 differences after register-number normalization.
#### AOSS_81401778
- initialize hello crc before table call: 79.16483%; instructions 275/273; 230 differences after register-number normalization.
- retain hello payload during header calls: 80.16849%; instructions 276/273; 245 differences after register-number normalization.
- share checksum accumulator and delay payload setup: 79.82051%; instructions 276/273; 245 differences after register-number normalization.
- compute hello checksum in eight byte loop: 79.82051%; instructions 276/273; 245 differences after register-number normalization.
- retain key schedule bytes within encryption round: 79.21612%; instructions 272/273; 184 differences after register-number normalization.
- use encrypted output cursor: 74.95971%; instructions 273/273; 232 differences after register-number normalization.
#### AOSS_81401E80
- xor directly into packet: 98.23129%; instructions 147/147; 2 differences after register-number normalization.
- read mask before packet: 97.99320%; instructions 147/147; 2 differences after register-number normalization.
- retain mask byte for xor: 97.99320%; instructions 147/147; 2 differences after register-number normalization.
## Uncertainties
- The gate uses odiff.dis, which interprets the first operand of conditional branches as an immediate. For CR1 branches that operand is a condition register, so its relative-target calculation changes with preceding function sizes. AOSS_81400E0C is already 100% in objdiff but fails that instruction-exact comparison. Tools were not changed.
- AOSS_Init_old target assembly reads r14 at 0x813FEC9C without a visible prior initialization in that function. Its source origin is unresolved. No uninitialized local was introduced.
- Register-number normalization is an iteration aid, not acceptance; it can hide register data-flow differences. Exact counts below come from the unchanged gate.
## Full gate
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/system/odh] pool: IDENTICAL
[src/system/odh] objdiff: code 4092/14684 data 6360/6360 functions 16/28 fuzzy 94.2454 linked code 0
[src/system/odh] instruction-exact functions: 16/28
[src/system/odh] section .data size 464 match 100.0
[src/system/odh] section .rodata size 5856 match 100.0
[src/system/odh] section .sdata2 size 40 match 100.0
[src/system/odh] section .text size 14684 match 94.24544
[src/system/odh] below 100: cdj_c_setQuantizationTable__9CArGBAOdhFP16SArCDJ_OdhMasterUl 94.14286
[src/system/odh] below 100: cdj_c_colorConv__9CArGBAOdhFP16SArCDJ_OdhMasterPUci 97.402596
[src/system/odh] below 100: LineConv11__9CArGBAOdhFPUcPUcPUcPUcUsUsPCli 80.746574
[src/system/odh] below 100: fdct_fast__9CArGBAOdhFPUlPUcUlPUl 89.78107
[src/system/odh] below 100: huffmanCoder__9CArGBAOdhFPUsP21SArCDJ_HuffmanRequest 96.50307
[src/system/odh] below 100: cdj_d_decompressLoop__9CArGBAOdhFP16SArCDJ_OdhMasterii 97.45273
[src/system/odh] below 100: cdj_d_setDequantizationTable__9CArGBAOdhFP16SArCDJ_OdhMasterUl 94.84314
[src/system/odh] below 100: LineDeconv21__9CArGBAOdhFPUcPUcPUcPUcUsUsPC12SArDeconvTbli 92.65
[src/system/odh] below 100: LineDeconv12__9CArGBAOdhFPUcPUcPUcPUcUsUsPC12SArDeconvTbli 83.4726
[src/system/odh] below 100: LineDeconv22__9CArGBAOdhFPUcPUcPUcPUcUsUsPC12SArDeconvTbli 96.434425
[src/system/odh] below 100: huffmanDecoder__9CArGBAOdhFPUlP21SArCDJ_HuffmanRequestPPUsiUl 94.93464
[src/system/odh] below 100: idct_fast__9CArGBAOdhFPCUcPUlPUlPUcUl 70.49789
[src/system/odh] baseline: code 4092/14684 data 6360 functions 16 fuzzy 93.2405
[src/scene/setting/AOSS] pool: IDENTICAL
[src/scene/setting/AOSS] objdiff: code 6436/16192 data 3896/3928 functions 16/21 fuzzy 87.9140 linked code 0
[src/scene/setting/AOSS] instruction-exact functions: 15/21
[src/scene/setting/AOSS] section .bss size 3496 match 100.0
[src/scene/setting/AOSS] section .data size 368 match 100.0
[src/scene/setting/AOSS] section .sbss size 32 match 42.857143
[src/scene/setting/AOSS] section .sdata size 24 match 100.0
[src/scene/setting/AOSS] section .sdata2 size 8 match 100.0
[src/scene/setting/AOSS] section .text size 16192 match 87.91403
[src/scene/setting/AOSS] below 100: AOSS_Init_old 73.34911
[src/scene/setting/AOSS] below 100: AOSS_81400830 97.0405
[src/scene/setting/AOSS] below 100: AOSS_814013AC 98.77193
[src/scene/setting/AOSS] below 100: AOSS_81401778 80.168495
[src/scene/setting/AOSS] below 100: AOSS_81401E80 98.605446
[src/scene/setting/AOSS] baseline: code 6436/16192 data 3896 functions 16 fuzzy 87.5926
regressions vs baseline: 0
global matched_code_percent: 85.90652 -> 85.90652
global fuzzy_match_percent: 98.69413 -> 98.70080
global complete_code_percent: 59.99415 -> 59.99415
global matched_data_percent: 90.86673 -> 90.86673
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
## Additional register attempts
- AOSS_81401E80, promote xor byte to word: 98.60545%; 147/147 instructions; 2 normalized differences. Rejected; committed source retained.
- AOSS_81401E80, promote xor mask to word: 98.57143%; 147/147 instructions; 2 normalized differences. Rejected; committed source retained.
- AOSS_81401E80, keep both xor operands as words: 98.57143%; 147/147 instructions; 2 normalized differences. Rejected; committed source retained.
- AOSS_814013AC, advance response argument as option cursor: 95.08772%; 114/114 instructions; 7 normalized differences. Rejected; committed source retained.
- AOSS_814013AC, reuse both response cursor and length arguments: 95.96491%; 114/114 instructions; 5 normalized differences. Rejected; committed source retained.
- AOSS_814013AC, name protocol state index before cursor length: 95.96491%; 114/114 instructions; 5 normalized differences. Rejected; committed source retained.