diff --git a/MARIOBRS.g1a b/MARIOBRS.g1a index 9e9d52f..dddd7cc 100644 Binary files a/MARIOBRS.g1a and b/MARIOBRS.g1a differ diff --git a/build-fx/map b/build-fx/map index 91a3a2b..d82eab2 100644 --- a/build-fx/map +++ b/build-fx/map @@ -6,6 +6,12 @@ Archive member included to satisfy reference by file (symbol) build-fx/src/tile.o (dsubimage) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) build-fx/src/main.o (dclear) +/usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + build-fx/src/main.o (keydown) +/usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) (iokbd_scan) +/usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) (getkey_repeat) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) (start) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) @@ -77,6 +83,9 @@ Discarded input sections .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) @@ -123,7 +132,7 @@ LOAD build-fx/assets/img/sprites.png.o LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x0000000000008dd0 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x000000000000bd9c _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -163,7 +172,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300ad0 _etors = . -.text 0x0000000000300ad0 0x2a78 +.text 0x0000000000300ad0 0x3218 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -173,222 +182,241 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.text .text.*) .text 0x0000000000300b1c 0x34 build-fx/src/tile.o 0x0000000000300b1c tuyau_draw - .text 0x0000000000300b50 0x68 build-fx/src/world.o + .text 0x0000000000300b50 0x124 build-fx/src/world.o 0x0000000000300b50 world_get - 0x0000000000300b80 display_cell - .text 0x0000000000300bb8 0x8 build-fx/src/main.o - 0x0000000000300bb8 callback - .text.startup 0x0000000000300bc0 0xc0 build-fx/src/main.o - 0x0000000000300bc0 main - .text 0x0000000000300c80 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - 0x0000000000300c80 dupdate - 0x0000000000300c98 dupdate_noint - .text 0x0000000000300ca4 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - 0x0000000000300ca4 dimage - 0x0000000000300cf8 dsubimage - .text 0x0000000000300d6c 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - 0x0000000000300d6c dclear - .text 0x0000000000300db8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .text 0x0000000000300db8 0x1c4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - 0x0000000000300f48 gint_panic - 0x0000000000300f58 gint_panic_set - 0x0000000000300f64 gint_exc_catch - 0x0000000000300f70 gint_exc_skip - .text 0x0000000000300f7c 0x17c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - 0x0000000000301030 gint_install - 0x00000000003010e0 gint_unload - .text 0x00000000003010f8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .text 0x00000000003010f8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) - .text 0x00000000003010f8 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - 0x00000000003010f8 tlb_addr - 0x000000000030110c tlb_data - 0x0000000000301120 tlb_mapped_memory - 0x00000000003011f4 utlb_addr - 0x0000000000301204 utlb_data - 0x0000000000301214 utlb_mapped_memory - .text 0x00000000003012ec 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x00000000003012ec dsize - .text 0x0000000000301388 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) - 0x0000000000301388 dprint - .text 0x00000000003013e0 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000301700 timer_setup - 0x0000000000301790 timer_delay - 0x00000000003017f0 timer_start - 0x0000000000301824 timer_reload - 0x0000000000301844 timer_pause - 0x0000000000301878 timer_stop - 0x00000000003018d4 timer_timeout - 0x00000000003018e0 timer_address - 0x000000000030191c timer_clear - .text 0x000000000030194c 0xce4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - 0x0000000000302348 kprint_opt - 0x0000000000302490 kprint - 0x0000000000302568 kvsprint - 0x00000000003025b0 sprintf - 0x00000000003025d8 vsprintf - 0x00000000003025f8 snprintf - 0x0000000000302618 vsnprintf - .text 0x0000000000302630 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - 0x0000000000302630 memcpy - 0x00000000003026ea _memmove - 0x00000000003026ee _memcmp - 0x00000000003026f2 memset - .text 0x000000000030270c 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x00000000003027a4 t6k11_display - 0x0000000000302878 t6k11_contrast - 0x00000000003028a4 t6k11_backlight - .text 0x00000000003028e4 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x0000000000302a28 clock_freq - .text 0x0000000000302a34 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .text 0x0000000000302a34 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - 0x0000000000302a34 bopti_asm_mono - 0x0000000000302a5a bopti_asm_mono_alpha - .text 0x0000000000302a8c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .text 0x0000000000302a8c 0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - 0x0000000000302a8c bopti_grid - 0x0000000000302c00 bopti_render - 0x0000000000302d30 bopti_render_clip - 0x0000000000302e44 bopti_render_noclip - .text 0x0000000000302e9c 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - 0x0000000000302e9c masks - .text 0x0000000000302f38 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - 0x0000000000302f38 gint_setvbr - .text 0x0000000000302f64 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .text 0x0000000000302f64 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - 0x0000000000302f64 gint_intlevel - 0x0000000000302fb8 gint_inthandler - .text 0x0000000000302fdc 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .text 0x0000000000302fdc 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .text 0x0000000000302fdc 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .text 0x0000000000302fdc 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - 0x0000000000302fdc __movstr - 0x0000000000302fdc __movmem - 0x0000000000303010 __movmemSI64 - 0x0000000000303010 __movstrSI64 - 0x0000000000303014 __movstrSI60 - 0x0000000000303014 __movmemSI60 - 0x0000000000303018 __movmemSI56 - 0x0000000000303018 __movstrSI56 - 0x000000000030301c __movstrSI52 - 0x000000000030301c __movmemSI52 - 0x0000000000303020 __movstrSI48 - 0x0000000000303020 __movmemSI48 - 0x0000000000303024 __movstrSI44 - 0x0000000000303024 __movmemSI44 - 0x0000000000303028 __movstrSI40 - 0x0000000000303028 __movmemSI40 - 0x000000000030302c __movstrSI36 - 0x000000000030302c __movmemSI36 - 0x0000000000303030 __movmemSI32 - 0x0000000000303030 __movstrSI32 - 0x0000000000303034 __movmemSI28 - 0x0000000000303034 __movstrSI28 - 0x0000000000303038 __movstrSI24 - 0x0000000000303038 __movmemSI24 - 0x000000000030303c __movmemSI20 - 0x000000000030303c __movstrSI20 - 0x0000000000303040 __movstrSI16 - 0x0000000000303040 __movmemSI16 - 0x0000000000303044 __movmemSI12 - 0x0000000000303044 __movstrSI12 - 0x0000000000303048 __movmemSI8 - 0x0000000000303048 __movstrSI8 - 0x000000000030304c __movmemSI4 - 0x000000000030304c __movstrSI4 - .text 0x0000000000303054 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - 0x0000000000303054 __udivdi3 - .text 0x0000000000303244 0x234 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) - 0x0000000000303244 __umoddi3 - .text 0x0000000000303478 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - 0x000000000030349a __udivsi3 - *fill* 0x00000000003034e4 0x4 - .text 0x00000000003034e8 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - 0x00000000003034e8 __udiv_qrnnd_16 - .text 0x0000000000303548 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x0000000000300b98 display_cell + 0x0000000000300bd4 world_draw + .text 0x0000000000300c74 0x8 build-fx/src/main.o + 0x0000000000300c74 callback + .text.startup 0x0000000000300c7c 0x90 build-fx/src/main.o + 0x0000000000300c7c main + .text 0x0000000000300d0c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + 0x0000000000300d0c dupdate + 0x0000000000300d24 dupdate_noint + .text 0x0000000000300d30 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + 0x0000000000300d30 dimage + 0x0000000000300d84 dsubimage + .text 0x0000000000300df8 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + 0x0000000000300df8 dclear + .text 0x0000000000300e44 0x3fc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000300fec pollevent + 0x0000000000301130 waitevent + 0x000000000030117c clearevents + 0x000000000030119c keydown + 0x00000000003011c8 keydown_all + 0x0000000000301204 keydown_any + .text 0x0000000000301240 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + 0x000000000030124c iokbd_row + 0x0000000000301334 iokbd_scan + .text 0x0000000000301364 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + 0x0000000000301364 getkey_opt + 0x0000000000301510 getkey + 0x000000000030151c getkey_repeat + .text 0x0000000000301558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .text 0x0000000000301558 0x1c4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + 0x00000000003016e8 gint_panic + 0x00000000003016f8 gint_panic_set + 0x0000000000301704 gint_exc_catch + 0x0000000000301710 gint_exc_skip + .text 0x000000000030171c 0x17c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + 0x00000000003017d0 gint_install + 0x0000000000301880 gint_unload + .text 0x0000000000301898 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000301898 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) + .text 0x0000000000301898 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + 0x0000000000301898 tlb_addr + 0x00000000003018ac tlb_data + 0x00000000003018c0 tlb_mapped_memory + 0x0000000000301994 utlb_addr + 0x00000000003019a4 utlb_data + 0x00000000003019b4 utlb_mapped_memory + .text 0x0000000000301a8c 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x0000000000301a8c dsize + .text 0x0000000000301b28 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) + 0x0000000000301b28 dprint + .text 0x0000000000301b80 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000301ea0 timer_setup + 0x0000000000301f30 timer_delay + 0x0000000000301f90 timer_start + 0x0000000000301fc4 timer_reload + 0x0000000000301fe4 timer_pause + 0x0000000000302018 timer_stop + 0x0000000000302074 timer_timeout + 0x0000000000302080 timer_address + 0x00000000003020bc timer_clear + .text 0x00000000003020ec 0xce4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + 0x0000000000302ae8 kprint_opt + 0x0000000000302c30 kprint + 0x0000000000302d08 kvsprint + 0x0000000000302d50 sprintf + 0x0000000000302d78 vsprintf + 0x0000000000302d98 snprintf + 0x0000000000302db8 vsnprintf + .text 0x0000000000302dd0 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + 0x0000000000302dd0 memcpy + 0x0000000000302e8a _memmove + 0x0000000000302e8e _memcmp + 0x0000000000302e92 memset + .text 0x0000000000302eac 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x0000000000302f44 t6k11_display + 0x0000000000303018 t6k11_contrast + 0x0000000000303044 t6k11_backlight + .text 0x0000000000303084 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x00000000003031c8 clock_freq + .text 0x00000000003031d4 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .text 0x00000000003031d4 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + 0x00000000003031d4 bopti_asm_mono + 0x00000000003031fa bopti_asm_mono_alpha + .text 0x000000000030322c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .text 0x000000000030322c 0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + 0x000000000030322c bopti_grid + 0x00000000003033a0 bopti_render + 0x00000000003034d0 bopti_render_clip + 0x00000000003035e4 bopti_render_noclip + .text 0x000000000030363c 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + 0x000000000030363c masks + .text 0x00000000003036d8 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + 0x00000000003036d8 gint_setvbr + .text 0x0000000000303704 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .text 0x0000000000303704 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + 0x0000000000303704 gint_intlevel + 0x0000000000303758 gint_inthandler + .text 0x000000000030377c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .text 0x000000000030377c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .text 0x000000000030377c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .text 0x000000000030377c 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + 0x000000000030377c __movstr + 0x000000000030377c __movmem + 0x00000000003037b0 __movmemSI64 + 0x00000000003037b0 __movstrSI64 + 0x00000000003037b4 __movstrSI60 + 0x00000000003037b4 __movmemSI60 + 0x00000000003037b8 __movmemSI56 + 0x00000000003037b8 __movstrSI56 + 0x00000000003037bc __movstrSI52 + 0x00000000003037bc __movmemSI52 + 0x00000000003037c0 __movstrSI48 + 0x00000000003037c0 __movmemSI48 + 0x00000000003037c4 __movstrSI44 + 0x00000000003037c4 __movmemSI44 + 0x00000000003037c8 __movstrSI40 + 0x00000000003037c8 __movmemSI40 + 0x00000000003037cc __movstrSI36 + 0x00000000003037cc __movmemSI36 + 0x00000000003037d0 __movmemSI32 + 0x00000000003037d0 __movstrSI32 + 0x00000000003037d4 __movmemSI28 + 0x00000000003037d4 __movstrSI28 + 0x00000000003037d8 __movstrSI24 + 0x00000000003037d8 __movmemSI24 + 0x00000000003037dc __movmemSI20 + 0x00000000003037dc __movstrSI20 + 0x00000000003037e0 __movstrSI16 + 0x00000000003037e0 __movmemSI16 + 0x00000000003037e4 __movmemSI12 + 0x00000000003037e4 __movstrSI12 + 0x00000000003037e8 __movmemSI8 + 0x00000000003037e8 __movstrSI8 + 0x00000000003037ec __movmemSI4 + 0x00000000003037ec __movstrSI4 + .text 0x00000000003037f4 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + 0x00000000003037f4 __udivdi3 + .text 0x00000000003039e4 0x234 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) + 0x00000000003039e4 __umoddi3 + .text 0x0000000000303c18 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + 0x0000000000303c3a __udivsi3 + *fill* 0x0000000000303c84 0x4 + .text 0x0000000000303c88 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000303c88 __udiv_qrnnd_16 + .text 0x0000000000303ce8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(C P) -.gint.blocks 0x0000000000303550 0x120 +.gint.blocks 0x0000000000303cf0 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000303550 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - 0x0000000000303550 gint_inth_7305 - 0x0000000000303570 gint_inth_7705 - .gint.blocks 0x0000000000303590 0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - 0x0000000000303590 inth_tmu - 0x0000000000303610 inth_etmu2 - 0x0000000000303630 inth_etmu_help - 0x0000000000303650 inth_etmux + .gint.blocks 0x0000000000303cf0 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + 0x0000000000303cf0 gint_inth_7305 + 0x0000000000303d10 gint_inth_7705 + .gint.blocks 0x0000000000303d30 0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + 0x0000000000303d30 inth_tmu + 0x0000000000303db0 inth_etmu2 + 0x0000000000303dd0 inth_etmu_help + 0x0000000000303df0 inth_etmux -.gint.drivers 0x0000000000303670 0x6c - 0x0000000000303670 _bdrv = . +.gint.drivers 0x0000000000303e10 0x90 + 0x0000000000303e10 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000303670 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x0000000000303670 drv_cpg + 0x0000000000303e10 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000303e10 drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000303694 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000303694 drv_tmu + 0x0000000000303e34 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000303e34 drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) + .gint.drivers.4 + 0x0000000000303e58 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000303e58 drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x00000000003036b8 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x00000000003036b8 drv_t6k11 + 0x0000000000303e7c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x0000000000303e7c drv_t6k11 *(.gint.drivers.6) - 0x00000000003036dc _edrv = . + 0x0000000000303ea0 _edrv = . -.rodata 0x00000000003036dc 0x5fcc +.rodata 0x0000000000303ea0 0x87d4 *(.rodata.4) *(.rodata .rodata.*) - .rodata 0x00000000003036dc 0x5000 build-fx/src/world.o - .rodata 0x00000000003086dc 0x64 build-fx/assets/img/mario.png.o - 0x00000000003086dc img_mario - 0x0000000000308740 img_mario_end - .rodata 0x0000000000308740 0x404 build-fx/assets/img/main.png.o - 0x0000000000308740 img_main - 0x0000000000308b44 img_main_end - .rodata 0x0000000000308b44 0x44 build-fx/assets/img/tuyau.png.o - 0x0000000000308b44 img_tuyau - 0x0000000000308b88 img_tuyau_end - .rodata 0x0000000000308b88 0x404 build-fx/assets/img/level.png.o - 0x0000000000308b88 img_level - 0x0000000000308f8c img_level_end - .rodata 0x0000000000308f8c 0x84 build-fx/assets/img/sprites.png.o - 0x0000000000308f8c img_sprites - 0x0000000000309010 img_sprites_end - .rodata 0x0000000000309010 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .rodata 0x0000000000303ea0 0x7800 build-fx/src/world.o + .rodata 0x000000000030b6a0 0x64 build-fx/assets/img/mario.png.o + 0x000000000030b6a0 img_mario + 0x000000000030b704 img_mario_end + .rodata 0x000000000030b704 0x404 build-fx/assets/img/main.png.o + 0x000000000030b704 img_main + 0x000000000030bb08 img_main_end + .rodata 0x000000000030bb08 0x44 build-fx/assets/img/tuyau.png.o + 0x000000000030bb08 img_tuyau + 0x000000000030bb4c img_tuyau_end + .rodata 0x000000000030bb4c 0x404 build-fx/assets/img/level.png.o + 0x000000000030bb4c img_level + 0x000000000030bf50 img_level_end + .rodata 0x000000000030bf50 0x84 build-fx/assets/img/sprites.png.o + 0x000000000030bf50 img_sprites + 0x000000000030bfd4 img_sprites_end + .rodata 0x000000000030bfd4 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) .rodata.str1.4 - 0x0000000000309018 0x11a /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + 0x000000000030bfdc 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030bfe2 0x2 + .rodata.str1.4 + 0x000000000030bfe4 0x11a /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) 0x11e (size before relaxing) - *fill* 0x0000000000309132 0x2 - .rodata 0x0000000000309134 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + *fill* 0x000000000030c0fe 0x2 + .rodata 0x000000000030c100 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x000000000030914c 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x000000000030c118 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) .rodata.str1.4 - 0x0000000000309150 0x31 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - *fill* 0x0000000000309181 0x3 + 0x000000000030c11c 0x31 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + *fill* 0x000000000030c14d 0x3 .rodata.str1.4 - 0x0000000000309184 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - *fill* 0x000000000030918a 0x2 + 0x000000000030c150 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + *fill* 0x000000000030c156 0x2 .rodata.str1.4 - 0x000000000030918c 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .rodata 0x0000000000309190 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .rodata 0x00000000003091a0 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) - 0x00000000003091a0 gint_font5x7 - 0x00000000003095a8 gint_font5x7_end - .rodata 0x00000000003095a8 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - 0x00000000003095a8 __clz_tab + 0x000000000030c158 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .rodata 0x000000000030c15c 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .rodata 0x000000000030c16c 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) + 0x000000000030c16c gint_font5x7 + 0x000000000030c574 gint_font5x7_end + .rodata 0x000000000030c574 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x000000000030c574 __clz_tab -.rela.dyn 0x00000000003096a8 0x0 - .rela.text.startup - 0x00000000003096a8 0x0 build-fx/src/main.o +.rela.dyn 0x000000000030c674 0x0 .rela.pretext.entry - 0x00000000003096a8 0x0 build-fx/src/main.o - .rela.text 0x00000000003096a8 0x0 build-fx/src/main.o + 0x000000000030c674 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .rela.text 0x000000000030c674 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) 0x0000000008100000 . = ORIGIN (ram) -.bss 0x0000000008100000 0x520 +.bss 0x0000000008100000 0x550 0x0000000008100000 _rbss = . *(.bss COMMON) .bss 0x0000000008100000 0x0 build-fx/src/tile.o @@ -397,109 +425,116 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a .bss 0x0000000008100000 0x400 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) - .bss 0x0000000008100400 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .bss 0x0000000008100400 0x114 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - .bss 0x0000000008100514 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .bss 0x0000000008100400 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .bss 0x0000000008100424 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + .bss 0x0000000008100424 0xc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) + .bss 0x0000000008100430 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .bss 0x0000000008100430 0x114 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + .bss 0x0000000008100544 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(B R) - 0x0000000008100520 . = ALIGN (0x10) - *fill* 0x0000000008100514 0xc - 0x0000000000000520 _sbss = SIZEOF (.bss) + 0x0000000008100550 . = ALIGN (0x10) + *fill* 0x0000000008100544 0xc + 0x0000000000000550 _sbss = SIZEOF (.bss) -.data 0x0000000008100520 0x70 load address 0x00000000003096a8 - 0x00000000003096a8 _ldata = LOADADDR (.data) - 0x0000000008100520 _rdata = . +.data 0x0000000008100550 0x80 load address 0x000000000030c674 + 0x000000000030c674 _ldata = LOADADDR (.data) + 0x0000000008100550 _rdata = . *(.data .data.*) - .data 0x0000000008100520 0x0 build-fx/src/tile.o - .data 0x0000000008100520 0x0 build-fx/src/world.o - .data 0x0000000008100520 0x0 build-fx/src/main.o - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) - .data 0x0000000008100520 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .data 0x0000000008100520 0x68 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - 0x0000000008100520 kprint_formatters - .data 0x0000000008100588 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - .data 0x0000000008100588 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - .data 0x0000000008100588 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .data 0x0000000008100588 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .data 0x0000000008100588 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - .data 0x0000000008100588 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x0000000008100588 topti_font - 0x000000000810058c gint_default_font - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - .data 0x0000000008100590 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .data 0x0000000008100550 0x0 build-fx/src/tile.o + .data 0x0000000008100550 0x0 build-fx/src/world.o + .data 0x0000000008100550 0x0 build-fx/src/main.o + .data 0x0000000008100550 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + .data 0x0000000008100550 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .data 0x0000000008100550 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + .data 0x0000000008100550 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .data 0x0000000008100550 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + .data 0x0000000008100550 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) + .data 0x0000000008100558 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .data 0x0000000008100558 0x68 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + 0x0000000008100558 kprint_formatters + .data 0x00000000081005c0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + .data 0x00000000081005c0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + .data 0x00000000081005c0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .data 0x00000000081005c0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .data 0x00000000081005c0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + .data 0x00000000081005c0 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x00000000081005c0 topti_font + 0x00000000081005c4 gint_default_font + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + .data 0x00000000081005c8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(D) - 0x0000000008100590 . = ALIGN (0x10) + 0x00000000081005d0 . = ALIGN (0x10) + *fill* 0x00000000081005c8 0x8 -.data.4 0x0000000008100590 0x0 load address 0x0000000000309718 +.data.4 0x00000000081005d0 0x0 load address 0x000000000030c6f4 *(.data.4) - 0x0000000008100590 . = ALIGN (0x10) - 0x0000000000000070 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) + 0x00000000081005d0 . = ALIGN (0x10) + 0x0000000000000080 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x0000000000309718 - 0x0000000000309718 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x000000000030c6f4 + 0x000000000030c6f4 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x0000000000309718 - 0x0000000000309718 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x000000000030c6f4 + 0x000000000030c6f4 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x0000000000309718 - 0x0000000000309718 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x000000000030c6f4 + 0x000000000030c6f4 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -509,39 +544,41 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x120 load address 0x0000000000309718 - 0x0000000000309718 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x000000000030c6f4 + 0x000000000030c6f4 _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) 0x000000008800f400 gint_vram - .gint.data 0x000000008800f404 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - 0x000000008800f404 gint_exc_catcher - 0x000000008800f408 gint_exc_panic - .gint.data 0x000000008800f40c 0x70 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .gint.data 0x000000008800f47c 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - .gint.data 0x000000008800f484 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - 0x000000008800f484 SH7305_INTC + .gint.data 0x000000008800f404 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .gint.data 0x000000008800f428 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + 0x000000008800f428 gint_exc_catcher + 0x000000008800f42c gint_exc_panic + .gint.data 0x000000008800f430 0x70 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .gint.data 0x000000008800f4a0 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + .gint.data 0x000000008800f4a8 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + 0x000000008800f4a8 SH7305_INTC .gint.data.sh3 - 0x000000008800f494 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - 0x000000008800f494 SH7705_INTC - *fill* 0x000000008800f4b8 0x8 - .gint.data 0x000000008800f4c0 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - 0x000000008800f520 . = ALIGN (0x10) - 0x0000000000000120 _sgdata = SIZEOF (.gint.data) + 0x000000008800f4b8 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + 0x000000008800f4b8 SH7705_INTC + *fill* 0x000000008800f4dc 0x4 + .gint.data 0x000000008800f4e0 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + 0x000000008800f540 . = ALIGN (0x10) + 0x0000000000000140 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f520 0x110 load address 0x0000000000309838 +.gint.bss 0x000000008800f540 0x290 load address 0x000000000030c834 *(.gint.bss .gint.bss.*) - .gint.bss 0x000000008800f520 0x1c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - .gint.bss 0x000000008800f53c 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - 0x000000008800f53c gint - .gint.bss 0x000000008800f57c 0x88 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .gint.bss 0x000000008800f604 0x1 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - *fill* 0x000000008800f605 0x3 - .gint.bss 0x000000008800f608 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x000000008800f630 . = ALIGN (0x10) - *fill* 0x000000008800f62c 0x4 - 0x0000000000000110 _sgbss = SIZEOF (.gint.bss) + .gint.bss 0x000000008800f540 0x180 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .gint.bss 0x000000008800f6c0 0x1c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + .gint.bss 0x000000008800f6dc 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + 0x000000008800f6dc gint + .gint.bss 0x000000008800f71c 0x88 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .gint.bss 0x000000008800f7a4 0x1 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + *fill* 0x000000008800f7a5 0x3 + .gint.bss 0x000000008800f7a8 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x000000008800f7d0 . = ALIGN (0x10) + *fill* 0x000000008800f7cc 0x4 + 0x0000000000000290 _sgbss = SIZEOF (.gint.bss) /DISCARD/ *(.debug_info .debug_abbrev .debug_loc .debug_aranges .debug_ranges .debug_line .debug_str) diff --git a/build-fx/src/MARIOBRS.bin b/build-fx/src/MARIOBRS.bin index 33bfaf1..aea9a7a 100755 Binary files a/build-fx/src/MARIOBRS.bin and b/build-fx/src/MARIOBRS.bin differ diff --git a/build-fx/src/main.d b/build-fx/src/main.d index 1b98fec..16ae303 100644 --- a/build-fx/src/main.d +++ b/build-fx/src/main.d @@ -1 +1,3 @@ -build-fx/src/main.o: src/main.c +build-fx/src/main.o: src/main.c src/world.h + +src/world.h: diff --git a/build-fx/src/main.o b/build-fx/src/main.o index 99945f7..ac7b410 100644 Binary files a/build-fx/src/main.o and b/build-fx/src/main.o differ diff --git a/build-fx/src/world.o b/build-fx/src/world.o index ba3ca0d..6a4e839 100644 Binary files a/build-fx/src/world.o and b/build-fx/src/world.o differ diff --git a/src/main.c b/src/main.c index 8041ed4..82734fb 100644 --- a/src/main.c +++ b/src/main.c @@ -2,6 +2,8 @@ #include #include +#include "world.h" + int callback(volatile void *arg) { volatile int *has_ticked = arg; @@ -23,15 +25,15 @@ int main(void) dclear(C_WHITE); - world_draw(); + world_draw(0,0); //ennemies_draw(); //mario_draw(); //ingame_draw(); dupdate(); - keyboard_reload(); - ennemies_move(); + //keyboard_reload(); + //ennemies_move(); if(keydown(KEY_EXIT)) game_running = 0; diff --git a/src/tile.h b/src/tile.h index 1df76a2..6a0e72d 100644 --- a/src/tile.h +++ b/src/tile.h @@ -3,14 +3,10 @@ #define TUYAU_H_TOP_LE 0 #define TUYAU_H_TOP_RI 1 - #define TUYAU_H_MID_LE 2 #define TUYAU_H_MID_RI 3 - - #define TUYAU_L_TOP_DO 4 #define TUYAU_L_TOP_UP 5 - #define TUYAU_L_MID_UP 6 #define TUYAU_L_MID_DO 7 diff --git a/src/world.c b/src/world.c index 8f8922e..f6af187 100644 --- a/src/world.c +++ b/src/world.c @@ -1,6 +1,8 @@ #include "world.h" #include "tile.h" +#define min(x,y) (x>y?y:x) +#define max(x,y) (x