mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-26 01:34:31 -04:00
7743e5a2c4
* wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
142 lines
3.8 KiB
C
142 lines
3.8 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <assert.h>
|
|
|
|
#define stb_big32(c) (((c)[0]<<24) + (c)[1]*65536 + (c)[2]*256 + (c)[3])
|
|
|
|
static void stb__sha1(unsigned char *chunk, unsigned h[5])
|
|
{
|
|
int i;
|
|
unsigned a,b,c,d,e;
|
|
unsigned w[80];
|
|
|
|
for (i=0; i < 16; ++i)
|
|
w[i] = stb_big32(&chunk[i*4]);
|
|
for (i=16; i < 80; ++i) {
|
|
unsigned t;
|
|
t = w[i-3] ^ w[i-8] ^ w[i-14] ^ w[i-16];
|
|
w[i] = (t + t) | (t >> 31);
|
|
}
|
|
|
|
a = h[0];
|
|
b = h[1];
|
|
c = h[2];
|
|
d = h[3];
|
|
e = h[4];
|
|
|
|
#define STB__SHA1(k,f) \
|
|
{ \
|
|
unsigned temp = (a << 5) + (a >> 27) + (f) + e + (k) + w[i]; \
|
|
e = d; \
|
|
d = c; \
|
|
c = (b << 30) + (b >> 2); \
|
|
b = a; \
|
|
a = temp; \
|
|
}
|
|
|
|
i=0;
|
|
for (; i < 20; ++i) STB__SHA1(0x5a827999, d ^ (b & (c ^ d)) );
|
|
for (; i < 40; ++i) STB__SHA1(0x6ed9eba1, b ^ c ^ d );
|
|
for (; i < 60; ++i) STB__SHA1(0x8f1bbcdc, (b & c) + (d & (b ^ c)) );
|
|
for (; i < 80; ++i) STB__SHA1(0xca62c1d6, b ^ c ^ d );
|
|
|
|
#undef STB__SHA1
|
|
|
|
h[0] += a;
|
|
h[1] += b;
|
|
h[2] += c;
|
|
h[3] += d;
|
|
h[4] += e;
|
|
}
|
|
|
|
void stb_sha1(unsigned char output[20], unsigned char *buffer, unsigned len)
|
|
{
|
|
unsigned char final_block[128];
|
|
unsigned end_start, final_len, j;
|
|
int i;
|
|
|
|
unsigned h[5];
|
|
|
|
h[0] = 0x67452301;
|
|
h[1] = 0xefcdab89;
|
|
h[2] = 0x98badcfe;
|
|
h[3] = 0x10325476;
|
|
h[4] = 0xc3d2e1f0;
|
|
|
|
// we need to write padding to the last one or two
|
|
// blocks, so build those first into 'final_block'
|
|
|
|
// we have to write one special byte, plus the 8-byte length
|
|
|
|
// compute the block where the data runs out
|
|
end_start = len & ~63;
|
|
|
|
// compute the earliest we can encode the length
|
|
if (((len+9) & ~63) == end_start) {
|
|
// it all fits in one block, so fill a second-to-last block
|
|
end_start -= 64;
|
|
}
|
|
|
|
final_len = end_start + 128;
|
|
|
|
// now we need to copy the data in
|
|
assert(end_start + 128 >= len+9);
|
|
assert(end_start < len || len < 64-9);
|
|
|
|
j = 0;
|
|
if (end_start > len)
|
|
j = (unsigned) - (int) end_start;
|
|
|
|
for (; end_start + j < len; ++j)
|
|
final_block[j] = buffer[end_start + j];
|
|
final_block[j++] = 0x80;
|
|
while (j < 128-5) // 5 byte length, so write 4 extra padding bytes
|
|
final_block[j++] = 0;
|
|
// big-endian size
|
|
final_block[j++] = len >> 29;
|
|
final_block[j++] = len >> 21;
|
|
final_block[j++] = len >> 13;
|
|
final_block[j++] = len >> 5;
|
|
final_block[j++] = len << 3;
|
|
assert(j == 128 && end_start + j == final_len);
|
|
|
|
for (j=0; j < final_len; j += 64) { // 512-bit chunks
|
|
if (j+64 >= end_start+64)
|
|
stb__sha1(&final_block[j - end_start], h);
|
|
else
|
|
stb__sha1(&buffer[j], h);
|
|
}
|
|
|
|
for (i=0; i < 5; ++i) {
|
|
output[i*4 + 0] = h[i] >> 24;
|
|
output[i*4 + 1] = h[i] >> 16;
|
|
output[i*4 + 2] = h[i] >> 8;
|
|
output[i*4 + 3] = h[i] >> 0;
|
|
}
|
|
}
|
|
|
|
// client can truncate this wherever they like
|
|
void stb_sha1_readable(char display[30], unsigned char sha[20])
|
|
{
|
|
char encoding[65] = "0123456789abcdefghijklmnopqrstuv"
|
|
"wxyzABCDEFGHIJKLMNOPQRSTUVWXYZ#$";
|
|
int num_bits = 0, acc=0;
|
|
int i=0,o=0;
|
|
while (o < 26) {
|
|
int v;
|
|
// expand the accumulator
|
|
if (num_bits < 6) {
|
|
assert(i != 20);
|
|
acc += sha[i++] << num_bits;
|
|
num_bits += 8;
|
|
}
|
|
v = acc & ((1 << 6) - 1);
|
|
display[o++] = encoding[v];
|
|
acc >>= 6;
|
|
num_bits -= 6;
|
|
}
|
|
assert(num_bits == 20*8 - 26*6);
|
|
display[o++] = '\0';
|
|
}
|
|
|