From 3f24a0c91178304d360507d7be594ac230fc7b22 Mon Sep 17 00:00:00 2001 From: milangames-art Date: Sat, 16 Nov 2019 12:02:30 +0100 Subject: [PATCH] add world_draw() --- MARIOBRS.g1a | Bin 17432 -> 51252 bytes build-fx/map | 639 ++++++++++++++++++++------------------ build-fx/src/MARIOBRS.bin | Bin 16920 -> 50740 bytes build-fx/src/main.d | 4 +- build-fx/src/main.o | Bin 1452 -> 1192 bytes build-fx/src/world.o | Bin 21392 -> 31900 bytes src/main.c | 8 +- src/tile.h | 4 - src/world.c | 19 +- src/world.h | 2 + 10 files changed, 366 insertions(+), 310 deletions(-) diff --git a/MARIOBRS.g1a b/MARIOBRS.g1a index 9e9d52ff20f4822ef182da9b1b0557d9d78ed15c..dddd7ccce6716429a21b8d23e7ec569f33d0649e 100644 GIT binary patch delta 5394 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 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 33bfaf10d75ec04081f9c55e1aab9d7aeb65eb04..aea9a7a3808d298e1b4e0defadfb8d86a6f73439 100755 GIT binary patch delta 6023 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 delta 581 zcmZ3%xrTd!5)+HeL>1L~x%wZ|EaU|pxEVN8nJ>sBelBFWF8z!_U&w*`3ByIHn^KNI z`i9g)h9?a2f}TKC9zc9S9Hjn&7=pYg>If1M1&fHl$R{NV9KDYoGF%h_neu?4p2J@) z^BV(q#y3Z422KVbn7Br9vH`R3#54054@}NsOixS#iGqLtgvx_ZaDFu!zXgpy6^*|H zjlX{K6UKz#)V#dZ+|1PC_>`i=a)$Wa#G=f6C_6JRJux>G%1J3LNJ%V7Wr)vCtxU>K zEJ}$lO3lenOks$Jn~->MaZm!Z3*)3=ASL z_8tZX(aoosSQvppeSuktjadh%e8uD+%*u>^Cd;s>u`vR}oH1dt2a6ILQvpzJ_v8W= RB{AkJK&A)SWC#H^4*<9sY#;yt diff --git a/build-fx/src/world.o b/build-fx/src/world.o index ba3ca0d38a4bb80c8a68d3cc1bcf7f8343314930..6a4e839cdf5c33b4ceba646e0a80d0f814c5e256 100644 GIT binary patch delta 589 zcmbQRoN>-i#tBOG)jSLg49pBBK$3w$gMo{IbE1riSg(k`(nA4Lv0lN4{~z+Oicb_~ zm0}TRlrojM$N|ER+$qWl%KmB$+zgx#|0@YRWDpWu|4m4UVFAMdut`8dzbzwKe_Cd- zztTmn`Y(>$NuLuwbg=hxgnUe!e331+xt_;gEwlccqjttOF!LJ&cg8n_=7;Y3(@ezm zm%U=p-==>||C;_Yf2Dqw`aci9^#8*js?w#5r9bZRzqHp6$~~O@DSfj^>gBZN zl*NAB)g0E-`@h#RR&YG3w@~l@P{ml!;;)wXE%#f_x9o3O-!dW2<7{AHVBfg#kN?IE zoEnqo2IMkUOy&+WaP<&kU|<9~UIyj?0SH42NO=IU4OHF&P2L5_Zvo;3Ao+`ka#G?`iW18~njIJz*g!Uc08lq4j9tUPzyV`7FfedK z*^CO4w*+=EF{(^<2vTCJ>H+GqnVb=%#KagexhF^sL~RLDV`YqBV5pdUKS-IWGGa1I kuo_!s4p8NV$p*ndO*TMgz~qQvC9$d#K&BHA!vNS80Ib@eaR2}S delta 351 zcmbR9lX1dw#tBOGK@32^%wPhd7&I8T7&s>inuvAsJQOe$>*aLeaN#iZxx(toVH#uV zlMuwf9T<3liGlke1H%H4hW|jU-SPsbJWiG2BI0bGrocJ!NKM{#y|d(BP(+m112A@G*C4VVqjnd%E|z-0T5e2`C2d? z0zk%On<`oJl+5CSoW#obQ6 z#l(;?*{52GEpP@OnzOh%oH$ZvOtX* jTfhdO>J5`^YJeJnMlzU9PN`863)}-_Isq{ZfNcT*b39OI 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