Game-Decompilation/fireemblem8u
1
0
Fork 0
mirror of https://github.com/FireEmblemUniverse/fireemblem8u.git synced 2024-11-27 15:10:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

run clang-format and rm artifacts

Browse Source 
Signed-off-by: Cameron Wong <cwong@g.harvard.edu>
This commit is contained in:
Cameron Wong 2022-11-09 16:17:35 -05:00
parent e0d7b560fb
commit 8fd78a99b0
No known key found for this signature in database
GPG Key ID: 9FF82C3903E55982
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tools/textencode/textencode.c
View File

@ -34,7 +34,8 @@ unsigned * huffmanTable;
u32 freq[MAX_VALUE_NUM] = { 0 }; u32 freq[MAX_VALUE_NUM] = { 0 };
typedef enum Direction { typedef enum Direction
{
LEFT, LEFT,
RIGHT, RIGHT,
} Direction_t; } Direction_t;
@ -46,7 +47,8 @@ int node_is_leaf(uint32_t node)
} }
// searches tree for value // searches tree for value
int search(uint32_t node, uint16_t value, Direction_t * out, int len) { int search(uint32_t node, uint16_t value, Direction_t * out, int len)
{
// Amazingly, attempting to factor out this use of [hipart] and [lopart] // Amazingly, attempting to factor out this use of [hipart] and [lopart]
// into helpers (e.g. [node_is_leaf]) causes a ~0.8x slowdown; presumably // into helpers (e.g. [node_is_leaf]) causes a ~0.8x slowdown; presumably
// there is some inlining and constant lifting that isn't firing. Alas. // there is some inlining and constant lifting that isn't firing. Alas.
@ -72,14 +74,14 @@ int search(uint32_t node, uint16_t value, Direction_t * out, int len) {
// The lower 16 bits of the node are the left child index // The lower 16 bits of the node are the left child index
// search left child // search left child
int left_len = search(huffmanTable[lopart], value, out, len+1); int left_len = search(huffmanTable[lopart], value, out, len + 1);
if (left_len != -1) if (left_len != -1)
{ {
out[len] = LEFT; out[len] = LEFT;
return left_len; return left_len;
} }
int right_len = search(huffmanTable[hipart], value, out, len+1); int right_len = search(huffmanTable[hipart], value, out, len + 1);
if (right_len != -1) if (right_len != -1)
{ {
out[len] = RIGHT; out[len] = RIGHT;
@ -91,27 +93,31 @@ int search(uint32_t node, uint16_t value, Direction_t * out, int len) {
return -1; return -1;
} }
typedef struct Entry { typedef struct Entry
{
// XXX: The maximum tree depth in the FE8U corpus is 19 so we should be // XXX: The maximum tree depth in the FE8U corpus is 19 so we should be
// okay fixing this value at 32, but it would be nice to be more general. // okay fixing this value at 32, but it would be nice to be more general.
u32 path; u32 path;
int len; int len;
} Entry_t; } Entry_t;
Entry_t cache[1<<16]; Entry_t cache[1 << 16];
void write_from_cache(uint16_t value, uint8_t * output, unsigned int * bit) void write_from_cache(uint16_t value, uint8_t * output, unsigned int * bit)
{ {
int len = cache[value].len; int len = cache[value].len;
int path = cache[value].path; int path = cache[value].path;
for (int i = 0; i < len ; i += 1, *bit += 1) { for (int i = 0; i < len; i += 1, *bit += 1)
{
unsigned int byte = *bit / 8; unsigned int byte = *bit / 8;
unsigned int bit_ = *bit % 8; unsigned int bit_ = *bit % 8;
if (path & (1 << i)) { if (path & (1 << i))
{
output[byte] |= (1 << bit_); output[byte] |= (1 << bit_);
} }
else { else
{
output[byte] &= ~(1 << bit_); output[byte] &= ~(1 << bit_);
} }
} }
@ -120,27 +126,34 @@ void write_from_cache(uint16_t value, uint8_t * output, unsigned int * bit)
int compress_value( int compress_value(
uint32_t node, uint16_t value, uint8_t * output, unsigned int * bit) uint32_t node, uint16_t value, uint8_t * output, unsigned int * bit)
{ {
if (cache[value].len > 0) { if (cache[value].len > 0)
{
write_from_cache(value, output, bit); write_from_cache(value, output, bit);
return 1; return 1;
} }
Direction_t path[32] = { LEFT }; Direction_t path[32] = { LEFT };
int len = search(node, value, (Direction_t *) &path, 0); int len = search(node, value, (Direction_t *)&path, 0);
if (len == -1) { return 0; } if (len == -1)
{
return 0;
}
cache[value].len = len; cache[value].len = len;
cache[value].path = 0; cache[value].path = 0;
for (int i = 0; i < len; i += 1, *bit += 1) { for (int i = 0; i < len; i += 1, *bit += 1)
{
unsigned int byte = *bit / 8; unsigned int byte = *bit / 8;
unsigned int bit_ = *bit % 8; unsigned int bit_ = *bit % 8;
if (path[i] == LEFT) { if (path[i] == LEFT)
{
cache[value].path &= ~(1 << i); cache[value].path &= ~(1 << i);
output[byte] &= ~(1 << bit_); output[byte] &= ~(1 << bit_);
} }
else { else
{
cache[value].path |= (1 << i); cache[value].path |= (1 << i);
output[byte] |= (1 << bit_); output[byte] |= (1 << bit_);
} }
@ -237,8 +250,7 @@ int compress_string(uint8_t * input, uint8_t * output)
// 2-byte // 2-byte
value = *input++; value = *input++;
value |= *input++ << 8; value |= *input++ << 8;
if (!compress_value( if (!compress_value(rootNode, value, output, &bit))
rootNode, value, output, &bit))
goto error; goto error;
break; break;
} }
@ -294,7 +306,7 @@ static void write_c_file(const char * filename)
{ {
FILE * outCFile; FILE * outCFile;
int i; int i;
uint8_t outputBuffer[10000] = {0}; // TODO: allocate this dynamically uint8_t outputBuffer[10000] = { 0 }; // TODO: allocate this dynamically
int size; int size;
outCFile = fopen(filename, "wb"); outCFile = fopen(filename, "wb");
@ -342,7 +354,7 @@ static void write_c_file(const char * filename)
fprintf( fprintf(
outCFile, outCFile,
"const u32 *const gMsgHuffmanTableRoot = gMsgHuffmanTable + %d;\n\n", "const u32 *const gMsgHuffmanTableRoot = gMsgHuffmanTable + %d;\n\n",
(int) g_node_count - 1); (int)g_node_count - 1);
// string table // string table
fputs("const u8 *const gMsgStringTable[] =\n{\n", outCFile); fputs("const u8 *const gMsgStringTable[] =\n{\n", outCFile);