mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-08 20:19:53 -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>
109 lines
3.5 KiB
Python
109 lines
3.5 KiB
Python
import unittest
|
|
import os
|
|
import tempfile
|
|
import shutil
|
|
from pathlib import Path
|
|
import re
|
|
|
|
from strip_other_fns import strip_other_fns_and_write
|
|
from src.compiler import Compiler
|
|
from src.preprocess import preprocess
|
|
from src import main
|
|
|
|
c_files_list = [
|
|
['test_general.c', 'test_general'],
|
|
['test_general.c', 'test_general_3'],
|
|
['test_general.c', 'test_general_multiple'],
|
|
['test_ternary.c', 'test_ternary1'],
|
|
['test_ternary.c', 'test_ternary2'],
|
|
['test_type.c', 'test_type1'],
|
|
['test_type.c', 'test_type2'],
|
|
['test_type.c', 'test_type3'],
|
|
['test_randomizer.c', 'test_randomizer'],
|
|
]
|
|
|
|
class TestStringMethods(unittest.TestCase):
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
compiler = Compiler('test/compile.sh')
|
|
cls.tmp_dirs = {}
|
|
for test_c, test_fn in c_files_list:
|
|
d = tempfile.TemporaryDirectory()
|
|
file_test = os.path.join('test', test_c)
|
|
file_actual = os.path.join(d.name, "actual.c")
|
|
file_base = os.path.join(d.name, "base.c")
|
|
file_target = os.path.join(d.name, "target.o")
|
|
|
|
actual_preprocessed = preprocess(file_test, cpp_args=['-DACTUAL'])
|
|
base_preprocessed = preprocess(file_test, cpp_args=['-UACTUAL'])
|
|
|
|
strip_other_fns_and_write(actual_preprocessed, test_fn, file_actual)
|
|
strip_other_fns_and_write(base_preprocessed, test_fn, file_base)
|
|
|
|
actual_source = Path(file_actual).read_text()
|
|
target_o = compiler.compile(actual_source, show_errors=True)
|
|
assert target_o is not None
|
|
shutil.copy2(target_o, file_target)
|
|
os.remove(target_o)
|
|
|
|
shutil.copy2("test/compile.sh", d.name)
|
|
cls.tmp_dirs[(test_c, test_fn)] = d
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
for d in cls.tmp_dirs.values():
|
|
d.cleanup()
|
|
|
|
def go(self, filename, fn_name, **kwargs) -> int:
|
|
d = self.tmp_dirs[(filename, fn_name)].name
|
|
score, = main.run(main.Options(directories=[d], stop_on_zero=True, **kwargs))
|
|
return score
|
|
|
|
def test_general(self):
|
|
score = self.go('test_general.c', 'test_general')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_general_3(self):
|
|
score = self.go('test_general.c', 'test_general_3')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_general_multiple(self):
|
|
score = self.go('test_general.c', 'test_general_multiple')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_ternary1(self):
|
|
score = self.go('test_ternary.c', 'test_ternary1')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_ternary2(self):
|
|
score = self.go('test_ternary.c', 'test_ternary2')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_type1(self):
|
|
score = self.go('test_type.c', 'test_type1')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_type2(self):
|
|
score = self.go('test_type.c', 'test_type2')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_type3(self):
|
|
score = self.go('test_type.c', 'test_type3')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_type3_threaded(self):
|
|
score = self.go('test_type.c', 'test_type3', threads=2)
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_randomizer(self):
|
|
score = self.go('test_randomizer.c', 'test_randomizer')
|
|
self.assertEqual(score, 0)
|
|
|
|
def test_randomizer_threaded(self):
|
|
score = self.go('test_randomizer.c', 'test_randomizer', threads=2)
|
|
self.assertEqual(score, 0)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|