diff --git a/MARIOBRS.g1a b/MARIOBRS.g1a index 5e5badf..86b68d0 100644 Binary files a/MARIOBRS.g1a and b/MARIOBRS.g1a differ diff --git a/build-fx/map b/build-fx/map index 86eb2ce..634f09d 100644 --- a/build-fx/map +++ b/build-fx/map @@ -1,7 +1,5 @@ Archive member included to satisfy reference by file (symbol) -/usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - build-fx/src/world.o (memcpy) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) build-fx/src/main.o (dupdate) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) @@ -9,11 +7,11 @@ Archive member included to satisfy reference by file (symbol) /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/mario.o (pollevent) + build-fx/src/keyboard.o (pollevent) /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) + build-fx/src/main.o (getkey) /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) @@ -34,6 +32,8 @@ Archive member included to satisfy reference by file (symbol) build-fx/src/main.o (timer_setup) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) (vsnprintf) +/usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) (memcpy) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) (t6k11_display) /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) @@ -81,7 +81,7 @@ Discarded input sections .comment 0x0000000000000000 0x12 build-fx/src/world.o .comment 0x0000000000000000 0x12 build-fx/src/mario.o .comment 0x0000000000000000 0x12 build-fx/src/main.o - .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + .comment 0x0000000000000000 0x12 build-fx/src/keyboard.o .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) @@ -97,6 +97,7 @@ Discarded input sections .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) .comment 0x0000000000000000 0x12 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) @@ -126,6 +127,7 @@ LOAD build-fx/src/tile.o LOAD build-fx/src/world.o LOAD build-fx/src/mario.o LOAD build-fx/src/main.o +LOAD build-fx/src/keyboard.o LOAD build-fx/assets/img/level.png.o LOAD build-fx/assets/img/mario.png.o LOAD build-fx/assets/img/death.png.o @@ -133,13 +135,14 @@ LOAD build-fx/assets/img/brick.png.o LOAD build-fx/assets/img/main.png.o LOAD build-fx/assets/img/mariosmall.png.o LOAD build-fx/assets/img/gift.png.o +LOAD build-fx/assets/img/error.png.o LOAD build-fx/assets/img/tuyau.png.o LOAD build-fx/assets/img/coin.png.o LOAD build-fx/assets/img/stone.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 - 0x0000000000004a4c _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x0000000000004f50 _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x8d0 *(.pretext.entry) @@ -179,7 +182,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300ad0 _etors = . -.text 0x0000000000300ad0 0x34f0 +.text 0x0000000000300ad0 0x35f0 0x0000000000300ad0 _gint_exch_tlbh_start = . *(.gint.exch_tlbh) .gint.exch_tlbh @@ -189,262 +192,267 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.text .text.*) .text 0x0000000000300b1c 0x40 build-fx/src/tile.o 0x0000000000300b1c draw_tile - .text 0x0000000000300b5c 0x1e4 build-fx/src/world.o + .text 0x0000000000300b5c 0x1fc build-fx/src/world.o 0x0000000000300b5c world_get - 0x0000000000300bc0 display_cell - 0x0000000000300c68 world_get_ctg - 0x0000000000300ca8 world_get_real_x0 - 0x0000000000300cb6 world_get_real_y0 - 0x0000000000300cc4 world_draw - .text 0x0000000000300d40 0x1c0 build-fx/src/mario.o - 0x0000000000300d40 mario_draw - 0x0000000000300d98 test_sol_le_plus_proche - 0x0000000000300e08 mario_move - .text 0x0000000000300f00 0x30 build-fx/src/main.o - 0x0000000000300f00 callback - .text.startup 0x0000000000300f30 0xb4 build-fx/src/main.o - 0x0000000000300f30 main - .text 0x0000000000300fe4 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - 0x0000000000300fe4 memcpy - 0x000000000030109e _memmove - 0x00000000003010a2 _memcmp - 0x00000000003010a6 memset - .text 0x00000000003010c0 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - 0x00000000003010c0 dupdate - 0x00000000003010d8 dupdate_noint - .text 0x00000000003010e4 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - 0x00000000003010e4 dimage - 0x0000000000301138 dsubimage - .text 0x00000000003011ac 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - 0x00000000003011ac dclear - .text 0x00000000003011f8 0x3fc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x00000000003013a0 pollevent - 0x00000000003014e4 waitevent - 0x0000000000301530 clearevents - 0x0000000000301550 keydown - 0x000000000030157c keydown_all - 0x00000000003015b8 keydown_any - .text 0x00000000003015f4 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - 0x0000000000301600 iokbd_row - 0x00000000003016e8 iokbd_scan - .text 0x0000000000301718 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - 0x0000000000301718 getkey_opt - 0x00000000003018c4 getkey - 0x00000000003018d0 getkey_repeat - .text 0x000000000030190c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .text 0x000000000030190c 0x1c4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - 0x0000000000301a9c gint_panic - 0x0000000000301aac gint_panic_set - 0x0000000000301ab8 gint_exc_catch - 0x0000000000301ac4 gint_exc_skip - .text 0x0000000000301ad0 0x17c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - 0x0000000000301b84 gint_install - 0x0000000000301c34 gint_unload - .text 0x0000000000301c4c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000301c4c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) - .text 0x0000000000301c4c 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - 0x0000000000301c4c tlb_addr - 0x0000000000301c60 tlb_data - 0x0000000000301c74 tlb_mapped_memory - 0x0000000000301d48 utlb_addr - 0x0000000000301d58 utlb_data - 0x0000000000301d68 utlb_mapped_memory - .text 0x0000000000301e40 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x0000000000301e40 dsize - .text 0x0000000000301edc 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) - 0x0000000000301edc dprint - .text 0x0000000000301f34 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000302254 timer_setup - 0x00000000003022e4 timer_delay - 0x0000000000302344 timer_start - 0x0000000000302378 timer_reload - 0x0000000000302398 timer_pause - 0x00000000003023cc timer_stop - 0x0000000000302428 timer_timeout - 0x0000000000302434 timer_address - 0x0000000000302470 timer_clear - .text 0x00000000003024a0 0xce4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - 0x0000000000302e9c kprint_opt - 0x0000000000302fe4 kprint - 0x00000000003030bc kvsprint - 0x0000000000303104 sprintf - 0x000000000030312c vsprintf - 0x000000000030314c snprintf - 0x000000000030316c vsnprintf - .text 0x0000000000303184 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x000000000030321c t6k11_display - 0x00000000003032f0 t6k11_contrast - 0x000000000030331c t6k11_backlight - .text 0x000000000030335c 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x00000000003034a0 clock_freq - .text 0x00000000003034ac 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .text 0x00000000003034ac 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - 0x00000000003034ac bopti_asm_mono - 0x00000000003034d2 bopti_asm_mono_alpha - .text 0x0000000000303504 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .text 0x0000000000303504 0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - 0x0000000000303504 bopti_grid - 0x0000000000303678 bopti_render - 0x00000000003037a8 bopti_render_clip - 0x00000000003038bc bopti_render_noclip - .text 0x0000000000303914 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - 0x0000000000303914 masks - .text 0x00000000003039b0 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - 0x00000000003039b0 gint_setvbr - .text 0x00000000003039dc 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .text 0x00000000003039dc 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - 0x00000000003039dc gint_intlevel - 0x0000000000303a30 gint_inthandler - .text 0x0000000000303a54 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .text 0x0000000000303a54 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .text 0x0000000000303a54 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .text 0x0000000000303a54 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - 0x0000000000303a54 __movstr - 0x0000000000303a54 __movmem - 0x0000000000303a88 __movmemSI64 - 0x0000000000303a88 __movstrSI64 - 0x0000000000303a8c __movstrSI60 - 0x0000000000303a8c __movmemSI60 - 0x0000000000303a90 __movmemSI56 - 0x0000000000303a90 __movstrSI56 - 0x0000000000303a94 __movstrSI52 - 0x0000000000303a94 __movmemSI52 - 0x0000000000303a98 __movstrSI48 - 0x0000000000303a98 __movmemSI48 - 0x0000000000303a9c __movstrSI44 - 0x0000000000303a9c __movmemSI44 - 0x0000000000303aa0 __movstrSI40 - 0x0000000000303aa0 __movmemSI40 - 0x0000000000303aa4 __movstrSI36 - 0x0000000000303aa4 __movmemSI36 - 0x0000000000303aa8 __movmemSI32 - 0x0000000000303aa8 __movstrSI32 - 0x0000000000303aac __movmemSI28 - 0x0000000000303aac __movstrSI28 - 0x0000000000303ab0 __movstrSI24 - 0x0000000000303ab0 __movmemSI24 - 0x0000000000303ab4 __movmemSI20 - 0x0000000000303ab4 __movstrSI20 - 0x0000000000303ab8 __movstrSI16 - 0x0000000000303ab8 __movmemSI16 - 0x0000000000303abc __movmemSI12 - 0x0000000000303abc __movstrSI12 - 0x0000000000303ac0 __movmemSI8 - 0x0000000000303ac0 __movstrSI8 - 0x0000000000303ac4 __movmemSI4 - 0x0000000000303ac4 __movstrSI4 - .text 0x0000000000303acc 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - 0x0000000000303acc __udivdi3 - .text 0x0000000000303cbc 0x234 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) - 0x0000000000303cbc __umoddi3 - .text 0x0000000000303ef0 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - 0x0000000000303f12 __udivsi3 - *fill* 0x0000000000303f5c 0x4 - .text 0x0000000000303f60 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - 0x0000000000303f60 __udiv_qrnnd_16 - .text 0x0000000000303fc0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x0000000000300ba4 display_cell + 0x0000000000300c7c world_get_ctg + 0x0000000000300cbc world_get_real_x0 + 0x0000000000300cca world_get_real_y0 + 0x0000000000300cd8 world_draw + .text 0x0000000000300d58 0x1e4 build-fx/src/mario.o + 0x0000000000300d58 mario_draw + 0x0000000000300db0 test_sol_le_plus_proche + 0x0000000000300e1c mario_move + .text 0x0000000000300f3c 0x40 build-fx/src/main.o + 0x0000000000300f3c callback + 0x0000000000300f44 system_error + .text.startup 0x0000000000300f7c 0xb0 build-fx/src/main.o + 0x0000000000300f7c main + .text 0x000000000030102c 0xbc build-fx/src/keyboard.o + 0x000000000030102c update_keyboard + .text 0x00000000003010e8 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + 0x00000000003010e8 dupdate + 0x0000000000301100 dupdate_noint + .text 0x000000000030110c 0xc8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + 0x000000000030110c dimage + 0x0000000000301160 dsubimage + .text 0x00000000003011d4 0x4c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + 0x00000000003011d4 dclear + .text 0x0000000000301220 0x3fc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x00000000003013c8 pollevent + 0x000000000030150c waitevent + 0x0000000000301558 clearevents + 0x0000000000301578 keydown + 0x00000000003015a4 keydown_all + 0x00000000003015e0 keydown_any + .text 0x000000000030161c 0x124 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + 0x0000000000301628 iokbd_row + 0x0000000000301710 iokbd_scan + .text 0x0000000000301740 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + 0x0000000000301740 getkey_opt + 0x00000000003018ec getkey + 0x00000000003018f8 getkey_repeat + .text 0x0000000000301934 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .text 0x0000000000301934 0x1c4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + 0x0000000000301ac4 gint_panic + 0x0000000000301ad4 gint_panic_set + 0x0000000000301ae0 gint_exc_catch + 0x0000000000301aec gint_exc_skip + .text 0x0000000000301af8 0x17c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + 0x0000000000301bac gint_install + 0x0000000000301c5c gint_unload + .text 0x0000000000301c74 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000301c74 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) + .text 0x0000000000301c74 0x1f4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + 0x0000000000301c74 tlb_addr + 0x0000000000301c88 tlb_data + 0x0000000000301c9c tlb_mapped_memory + 0x0000000000301d70 utlb_addr + 0x0000000000301d80 utlb_data + 0x0000000000301d90 utlb_mapped_memory + .text 0x0000000000301e68 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x0000000000301e68 dsize + .text 0x0000000000301f04 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) + 0x0000000000301f04 dprint + .text 0x0000000000301f5c 0x56c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x000000000030227c timer_setup + 0x000000000030230c timer_delay + 0x000000000030236c timer_start + 0x00000000003023a0 timer_reload + 0x00000000003023c0 timer_pause + 0x00000000003023f4 timer_stop + 0x0000000000302450 timer_timeout + 0x000000000030245c timer_address + 0x0000000000302498 timer_clear + .text 0x00000000003024c8 0xce4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + 0x0000000000302ec4 kprint_opt + 0x000000000030300c kprint + 0x00000000003030e4 kvsprint + 0x000000000030312c sprintf + 0x0000000000303154 vsprintf + 0x0000000000303174 snprintf + 0x0000000000303194 vsnprintf + .text 0x00000000003031ac 0xdc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + 0x00000000003031ac memcpy + 0x0000000000303266 _memmove + 0x000000000030326a _memcmp + 0x000000000030326e memset + .text 0x0000000000303288 0x1d8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x0000000000303320 t6k11_display + 0x00000000003033f4 t6k11_contrast + 0x0000000000303420 t6k11_backlight + .text 0x0000000000303460 0x150 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x00000000003035a4 clock_freq + .text 0x00000000003035b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .text 0x00000000003035b0 0x58 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + 0x00000000003035b0 bopti_asm_mono + 0x00000000003035d6 bopti_asm_mono_alpha + .text 0x0000000000303608 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .text 0x0000000000303608 0x410 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + 0x0000000000303608 bopti_grid + 0x000000000030377c bopti_render + 0x00000000003038ac bopti_render_clip + 0x00000000003039c0 bopti_render_noclip + .text 0x0000000000303a18 0x9c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + 0x0000000000303a18 masks + .text 0x0000000000303ab4 0x2c /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + 0x0000000000303ab4 gint_setvbr + .text 0x0000000000303ae0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .text 0x0000000000303ae0 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + 0x0000000000303ae0 gint_intlevel + 0x0000000000303b34 gint_inthandler + .text 0x0000000000303b58 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .text 0x0000000000303b58 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .text 0x0000000000303b58 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .text 0x0000000000303b58 0x78 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + 0x0000000000303b58 __movstr + 0x0000000000303b58 __movmem + 0x0000000000303b8c __movmemSI64 + 0x0000000000303b8c __movstrSI64 + 0x0000000000303b90 __movstrSI60 + 0x0000000000303b90 __movmemSI60 + 0x0000000000303b94 __movmemSI56 + 0x0000000000303b94 __movstrSI56 + 0x0000000000303b98 __movstrSI52 + 0x0000000000303b98 __movmemSI52 + 0x0000000000303b9c __movstrSI48 + 0x0000000000303b9c __movmemSI48 + 0x0000000000303ba0 __movstrSI44 + 0x0000000000303ba0 __movmemSI44 + 0x0000000000303ba4 __movstrSI40 + 0x0000000000303ba4 __movmemSI40 + 0x0000000000303ba8 __movstrSI36 + 0x0000000000303ba8 __movmemSI36 + 0x0000000000303bac __movmemSI32 + 0x0000000000303bac __movstrSI32 + 0x0000000000303bb0 __movmemSI28 + 0x0000000000303bb0 __movstrSI28 + 0x0000000000303bb4 __movstrSI24 + 0x0000000000303bb4 __movmemSI24 + 0x0000000000303bb8 __movmemSI20 + 0x0000000000303bb8 __movstrSI20 + 0x0000000000303bbc __movstrSI16 + 0x0000000000303bbc __movmemSI16 + 0x0000000000303bc0 __movmemSI12 + 0x0000000000303bc0 __movstrSI12 + 0x0000000000303bc4 __movmemSI8 + 0x0000000000303bc4 __movstrSI8 + 0x0000000000303bc8 __movmemSI4 + 0x0000000000303bc8 __movstrSI4 + .text 0x0000000000303bd0 0x1f0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + 0x0000000000303bd0 __udivdi3 + .text 0x0000000000303dc0 0x234 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) + 0x0000000000303dc0 __umoddi3 + .text 0x0000000000303ff4 0x6c /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + 0x0000000000304016 __udivsi3 + .text 0x0000000000304060 0x60 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000304060 __udiv_qrnnd_16 + .text 0x00000000003040c0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(C P) -.gint.blocks 0x0000000000303fc0 0x120 +.gint.blocks 0x00000000003040c0 0x120 *(.gint.blocks) - .gint.blocks 0x0000000000303fc0 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - 0x0000000000303fc0 gint_inth_7305 - 0x0000000000303fe0 gint_inth_7705 - .gint.blocks 0x0000000000304000 0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - 0x0000000000304000 inth_tmu - 0x0000000000304080 inth_etmu2 - 0x00000000003040a0 inth_etmu_help - 0x00000000003040c0 inth_etmux + .gint.blocks 0x00000000003040c0 0x40 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + 0x00000000003040c0 gint_inth_7305 + 0x00000000003040e0 gint_inth_7705 + .gint.blocks 0x0000000000304100 0xe0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + 0x0000000000304100 inth_tmu + 0x0000000000304180 inth_etmu2 + 0x00000000003041a0 inth_etmu_help + 0x00000000003041c0 inth_etmux -.gint.drivers 0x00000000003040e0 0x90 - 0x00000000003040e0 _bdrv = . +.gint.drivers 0x00000000003041e0 0x90 + 0x00000000003041e0 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x00000000003040e0 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x00000000003040e0 drv_cpg + 0x00000000003041e0 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x00000000003041e0 drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000304104 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000304104 drv_tmu + 0x0000000000304204 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000304204 drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000304128 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x0000000000304128 drv_keysc + 0x0000000000304228 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000304228 drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x000000000030414c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x000000000030414c drv_t6k11 + 0x000000000030424c 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x000000000030424c drv_t6k11 *(.gint.drivers.6) - 0x0000000000304170 _edrv = . + 0x0000000000304270 _edrv = . -.rodata 0x0000000000304170 0x11ac +.rodata 0x0000000000304270 0x15b0 *(.rodata.4) *(.rodata .rodata.*) - .rodata 0x0000000000304170 0x404 build-fx/assets/img/level.png.o - 0x0000000000304170 img_level - 0x0000000000304574 img_level_end - .rodata 0x0000000000304574 0x64 build-fx/assets/img/mario.png.o - 0x0000000000304574 img_mario - 0x00000000003045d8 img_mario_end - .rodata 0x00000000003045d8 0x24 build-fx/assets/img/death.png.o - 0x00000000003045d8 img_death - 0x00000000003045fc img_death_end - .rodata 0x00000000003045fc 0x4c build-fx/assets/img/brick.png.o - 0x00000000003045fc img_brick - 0x0000000000304648 img_brick_end - .rodata 0x0000000000304648 0x404 build-fx/assets/img/main.png.o - 0x0000000000304648 img_main - 0x0000000000304a4c img_main_end - .rodata 0x0000000000304a4c 0xdc build-fx/assets/img/mariosmall.png.o - 0x0000000000304a4c img_mariosmall - 0x0000000000304b28 img_mariosmall_end - .rodata 0x0000000000304b28 0x28 build-fx/assets/img/gift.png.o - 0x0000000000304b28 img_gift - 0x0000000000304b50 img_gift_end - .rodata 0x0000000000304b50 0xb8 build-fx/assets/img/tuyau.png.o - 0x0000000000304b50 img_tuyau - 0x0000000000304c08 img_tuyau_end - .rodata 0x0000000000304c08 0x28 build-fx/assets/img/coin.png.o - 0x0000000000304c08 img_coin - 0x0000000000304c30 img_coin_end - .rodata 0x0000000000304c30 0x4c build-fx/assets/img/stone.png.o - 0x0000000000304c30 img_stone - 0x0000000000304c7c img_stone_end - .rodata 0x0000000000304c7c 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .rodata 0x0000000000304270 0x404 build-fx/assets/img/level.png.o + 0x0000000000304270 img_level + 0x0000000000304674 img_level_end + .rodata 0x0000000000304674 0x64 build-fx/assets/img/mario.png.o + 0x0000000000304674 img_mario + 0x00000000003046d8 img_mario_end + .rodata 0x00000000003046d8 0x24 build-fx/assets/img/death.png.o + 0x00000000003046d8 img_death + 0x00000000003046fc img_death_end + .rodata 0x00000000003046fc 0x4c build-fx/assets/img/brick.png.o + 0x00000000003046fc img_brick + 0x0000000000304748 img_brick_end + .rodata 0x0000000000304748 0x404 build-fx/assets/img/main.png.o + 0x0000000000304748 img_main + 0x0000000000304b4c img_main_end + .rodata 0x0000000000304b4c 0xdc build-fx/assets/img/mariosmall.png.o + 0x0000000000304b4c img_mariosmall + 0x0000000000304c28 img_mariosmall_end + .rodata 0x0000000000304c28 0x28 build-fx/assets/img/gift.png.o + 0x0000000000304c28 img_gift + 0x0000000000304c50 img_gift_end + .rodata 0x0000000000304c50 0x404 build-fx/assets/img/error.png.o + 0x0000000000304c50 img_error + 0x0000000000305054 img_error_end + .rodata 0x0000000000305054 0xb8 build-fx/assets/img/tuyau.png.o + 0x0000000000305054 img_tuyau + 0x000000000030510c img_tuyau_end + .rodata 0x000000000030510c 0x28 build-fx/assets/img/coin.png.o + 0x000000000030510c img_coin + 0x0000000000305134 img_coin_end + .rodata 0x0000000000305134 0x4c build-fx/assets/img/stone.png.o + 0x0000000000305134 img_stone + 0x0000000000305180 img_stone_end + .rodata 0x0000000000305180 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) .rodata.str1.4 - 0x0000000000304c84 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - *fill* 0x0000000000304c8a 0x2 + 0x0000000000305188 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030518e 0x2 .rodata.str1.4 - 0x0000000000304c8c 0x11a /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + 0x0000000000305190 0x11a /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) 0x11e (size before relaxing) - *fill* 0x0000000000304da6 0x2 - .rodata 0x0000000000304da8 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + *fill* 0x00000000003052aa 0x2 + .rodata 0x00000000003052ac 0x18 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x0000000000304dc0 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x00000000003052c4 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) .rodata.str1.4 - 0x0000000000304dc4 0x31 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - *fill* 0x0000000000304df5 0x3 + 0x00000000003052c8 0x31 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + *fill* 0x00000000003052f9 0x3 .rodata.str1.4 - 0x0000000000304df8 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - *fill* 0x0000000000304dfe 0x2 + 0x00000000003052fc 0x6 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + *fill* 0x0000000000305302 0x2 .rodata.str1.4 - 0x0000000000304e00 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .rodata 0x0000000000304e04 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .rodata 0x0000000000304e14 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) - 0x0000000000304e14 gint_font5x7 - 0x000000000030521c gint_font5x7_end - .rodata 0x000000000030521c 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - 0x000000000030521c __clz_tab + 0x0000000000305304 0x4 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .rodata 0x0000000000305308 0x10 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .rodata 0x0000000000305318 0x408 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) + 0x0000000000305318 gint_font5x7 + 0x0000000000305720 gint_font5x7_end + .rodata 0x0000000000305720 0x100 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x0000000000305720 __clz_tab -.rela.dyn 0x000000000030531c 0x0 +.rela.dyn 0x0000000000305820 0x0 .rela.pretext.entry - 0x000000000030531c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .rela.text 0x000000000030531c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + 0x0000000000305820 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .rela.text 0x0000000000305820 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) 0x0000000008100000 . = ORIGIN (ram) -.bss 0x0000000008100000 0x550 +.bss 0x0000000008100000 0x570 0x0000000008100000 _rbss = . *(.bss COMMON) .bss 0x0000000008100000 0x0 build-fx/src/tile.o @@ -453,127 +461,130 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x0000000008100000 global_quit 0x0000000008100004 numero_frame .bss 0x0000000008100008 0x0 build-fx/src/main.o - .bss 0x0000000008100008 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - .bss 0x0000000008100008 0x400 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - .bss 0x0000000008100408 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - .bss 0x0000000008100408 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - .bss 0x0000000008100408 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - .bss 0x000000000810042c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - .bss 0x000000000810042c 0xc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) - .bss 0x0000000008100438 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .bss 0x0000000008100438 0x114 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - .bss 0x000000000810054c 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .bss 0x0000000008100008 0x18 build-fx/src/keyboard.o + 0x0000000008100008 keys + .bss 0x0000000008100020 0x400 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + .bss 0x0000000008100420 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .bss 0x0000000008100420 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + .bss 0x0000000008100420 0x24 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .bss 0x0000000008100444 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + .bss 0x0000000008100444 0xc /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) + .bss 0x0000000008100450 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .bss 0x0000000008100450 0x114 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + .bss 0x0000000008100564 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(B R) - 0x0000000008100550 . = ALIGN (0x10) - *fill* 0x000000000810054c 0x4 - 0x0000000000000550 _sbss = SIZEOF (.bss) + 0x0000000008100570 . = ALIGN (0x10) + *fill* 0x0000000008100564 0xc + 0x0000000000000570 _sbss = SIZEOF (.bss) -.data 0x0000000008100550 0x1c0 load address 0x000000000030531c - 0x000000000030531c _ldata = LOADADDR (.data) - 0x0000000008100550 _rdata = . +.data 0x0000000008100570 0x1c0 load address 0x0000000000305820 + 0x0000000000305820 _ldata = LOADADDR (.data) + 0x0000000008100570 _rdata = . *(.data .data.*) - .data 0x0000000008100550 0x50 build-fx/src/tile.o - 0x0000000008100550 coin - 0x0000000008100560 gift - 0x0000000008100570 earth - 0x0000000008100580 brick - 0x0000000008100590 tuyau - .data 0x00000000081005a0 0xc0 build-fx/src/world.o - .data 0x0000000008100660 0x30 build-fx/src/mario.o - 0x0000000008100660 mario - 0x0000000008100680 mario_small - .data 0x0000000008100690 0x0 build-fx/src/main.o - .data 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - .data 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - .data 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - .data 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - .data 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - .data 0x0000000008100690 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - .data 0x0000000008100690 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) - .data 0x0000000008100698 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .data 0x0000000008100698 0x68 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - 0x0000000008100698 kprint_formatters - .data 0x0000000008100700 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - .data 0x0000000008100700 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - .data 0x0000000008100700 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) - .data 0x0000000008100700 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - .data 0x0000000008100700 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x0000000008100700 topti_font - 0x0000000008100704 gint_default_font - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - .data 0x0000000008100708 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .data 0x0000000008100570 0x50 build-fx/src/tile.o + 0x0000000008100570 coin + 0x0000000008100580 gift + 0x0000000008100590 earth + 0x00000000081005a0 brick + 0x00000000081005b0 tuyau + .data 0x00000000081005c0 0xc0 build-fx/src/world.o + .data 0x0000000008100680 0x30 build-fx/src/mario.o + 0x0000000008100680 mario + 0x00000000081006a0 mario_small + .data 0x00000000081006b0 0x0 build-fx/src/main.o + .data 0x00000000081006b0 0x0 build-fx/src/keyboard.o + .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + .data 0x00000000081006b0 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + .data 0x00000000081006b0 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.c.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.s.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dprint.c.o) + .data 0x00000000081006b8 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .data 0x00000000081006b8 0x68 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + 0x00000000081006b8 kprint_formatters + .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dtext.c.o) + .data 0x0000000008100720 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + .data 0x0000000008100720 0x8 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x0000000008100720 topti_font + 0x0000000008100724 gint_default_font + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_umoddi3.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + .data 0x0000000008100728 0x0 /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) *(D) - 0x0000000008100710 . = ALIGN (0x10) - *fill* 0x0000000008100708 0x8 + 0x0000000008100730 . = ALIGN (0x10) + *fill* 0x0000000008100728 0x8 -.data.4 0x0000000008100710 0x0 load address 0x00000000003054dc +.data.4 0x0000000008100730 0x0 load address 0x00000000003059e0 *(.data.4) - 0x0000000008100710 . = ALIGN (0x10) + 0x0000000008100730 . = ALIGN (0x10) 0x00000000000001c0 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x0 load address 0x00000000003054dc - 0x00000000003054dc _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x0 load address 0x00000000003059e0 + 0x00000000003059e0 _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) 0x00000000e5200000 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x00000000003054dc - 0x00000000003054dc _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x00000000003059e0 + 0x00000000003059e0 _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x00000000003054dc - 0x00000000003054dc _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x00000000003059e0 + 0x00000000003059e0 _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -583,8 +594,8 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x140 load address 0x00000000003054dc - 0x00000000003054dc _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x140 load address 0x00000000003059e0 + 0x00000000003059e0 _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) @@ -605,7 +616,7 @@ LOAD /usr/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x000000008800f540 . = ALIGN (0x10) 0x0000000000000140 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f540 0x290 load address 0x000000000030561c +.gint.bss 0x000000008800f540 0x290 load address 0x0000000000305b20 *(.gint.bss .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) diff --git a/build-fx/src/MARIOBRS.bin b/build-fx/src/MARIOBRS.bin index ffd046a..661b4e8 100755 Binary files a/build-fx/src/MARIOBRS.bin and b/build-fx/src/MARIOBRS.bin differ diff --git a/build-fx/src/main.o b/build-fx/src/main.o index 45324a0..2ffe1b9 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 e0b90e0..d0516df 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 50e0b97..aa5013a 100644 --- a/src/main.c +++ b/src/main.c @@ -5,16 +5,28 @@ #include "world.h" #include "mario.h" +#include +#include +#include +extern image_t img_error; +GNORETURN void system_error(uint32_t code) +{ + timer_stop(0); + dimage(0,0,&img_error); + dupdate(); + while(1) getkey(); +} + int callback(volatile void *arg) { volatile int *has_ticked = arg; *has_ticked = 1; - numero_frame=(numero_frame+1)%6; return 0; } int main(void) { + gint_panic_set(system_error); volatile int has_ticked = 1; timer_setup(0, timer_delay(0, 10000), timer_Po_4, callback, &has_ticked); @@ -35,8 +47,6 @@ int main(void) //keyboard_reload(); mario_move(); - - if(keydown(KEY_EXIT)) global_quit = 1; } timer_stop(0); diff --git a/src/world.c b/src/world.c index b71e872..ad8df84 100644 --- a/src/world.c +++ b/src/world.c @@ -2,8 +2,7 @@ #include "tile.h" #include -#define min(x,y) (x>y?y:x) -#define max(x,y) (xtype==TUYAU) + draw_tile(sx, sy, &tuyau, cell->p1, cell->p2); - if (cell.type==EARTH) - draw_tile(sx, sy, &earth, cell.p1, cell.p2); + if (cell->type==EARTH) + draw_tile(sx, sy, &earth, cell->p1, cell->p2); - if (cell.type==BRICK) - draw_tile(sx, sy, &brick, 0, cell.p1); + if (cell->type==BRICK) + draw_tile(sx, sy, &brick, 0, cell->p1); - if (cell.type==GIFT) - draw_tile(sx, sy, &gift, cell.p1, 0); + if (cell->type==GIFT) + draw_tile(sx, sy, &gift, cell->p1, 0); - if (cell.type==COIN) - draw_tile(sx, sy, &coin, cell.p1, 0); + if (cell->type==COIN) + draw_tile(sx, sy, &coin, cell->p1, 0); } int world_get_ctg(int x, int y) { - world_t c=world_get(x,y); - if (c.type==DEATH) + world_t *c=world_get(x,y); + if (c==0) { return CTG_DEATH; } - switch (c.type) + switch (c->type) { case COIN: case EMPTY: @@ -84,33 +83,17 @@ int world_get_ctg(int x, int y) return CTG_EMPTY; } } -/* -static world_get_leftx(int x) -{ - int r = max(x-63,0)%8;// if (r>0) r-=8; - return r; -} -static world_get_bottomy(int x) +static int max(const int x, const int y) { - int r = max(x-31,0)%8;// if (r>0) r-=8; - return r; + return (x