diff --git a/1v13D.g1a b/1v13D.g1a index c2b9f23..160e4b9 100644 Binary files a/1v13D.g1a and b/1v13D.g1a differ diff --git a/INIT/CasioRAM.mem b/INIT/CasioRAM.mem index 7bd7ae5..769a810 100644 Binary files a/INIT/CasioRAM.mem and b/INIT/CasioRAM.mem differ diff --git a/build-fx/map b/build-fx/map index 7ca4fbe..4b41518 100644 --- a/build-fx/map +++ b/build-fx/map @@ -295,7 +295,7 @@ LOAD build-fx/assets/fonts/FxEngine.png.o LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x0000000000004ffc _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x000000000000507c _srom = ((((0x200 + SIZEOF (.text)) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .pretext 0x0000000000300200 0x890 *(.pretext.entry) @@ -334,7 +334,7 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(.dtors .dtors.*) 0x0000000000300a90 _etors = . -.text 0x0000000000300a90 0x43d8 +.text 0x0000000000300a90 0x4458 *(.text .text.*) .text 0x0000000000300a90 0x154 build-fx/src/FxEngine/libprof.o 0x0000000000300a90 _prof_time @@ -354,265 +354,265 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x0000000000301490 _FE_get_fps_current 0x00000000003014b0 _FE_get_fps_min 0x00000000003014d0 _FE_get_fps_max - .text 0x00000000003014f0 0x124 build-fx/src/FxEngine/face.o + .text 0x00000000003014f0 0x19c build-fx/src/FxEngine/face.o 0x00000000003014f0 _FE_draw_face - .text 0x0000000000301614 0xb4 build-fx/src/FxEngine/zbuffer.o - 0x0000000000301614 _FE_zbuffer_clear - 0x000000000030167c _FE_zbuffer_set_dist - .text 0x00000000003016c8 0x0 build-fx/src/main.o - .text.startup 0x00000000003016c8 0xa4 build-fx/src/main.o - 0x00000000003016c8 _main - .text 0x000000000030176c 0x74 build-fx/src/controls.o - 0x000000000030176c _init_controls - 0x000000000030177c _reload_fps_displaying - 0x00000000003017a0 _display_fps - .text 0x00000000003017e0 0x150 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x0000000000301924 _clock_freq - .text 0x0000000000301930 0x2c8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x0000000000301ad4 _pollevent - 0x0000000000301bc0 _waitevent - .text 0x0000000000301bf8 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) - .text 0x0000000000301bf8 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) - .text 0x0000000000301bf8 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) - .text 0x0000000000301bf8 0x1f4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) - 0x0000000000301bf8 _tlb_addr - 0x0000000000301c0c _tlb_data - 0x0000000000301c20 _tlb_mapped_memory - 0x0000000000301cf4 _utlb_addr - 0x0000000000301d04 _utlb_data - 0x0000000000301d14 _utlb_mapped_memory - .text 0x0000000000301dec 0x56c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x000000000030210c _timer_setup - 0x000000000030219c _timer_delay - 0x00000000003021fc _timer_start - 0x0000000000302230 _timer_reload - 0x0000000000302250 _timer_pause - 0x0000000000302284 _timer_stop - 0x00000000003022e0 _timer_timeout - 0x00000000003022ec _timer_address - 0x0000000000302328 _timer_clear - .text 0x0000000000302358 0x9c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - 0x0000000000302358 _dsize - .text 0x00000000003023f4 0x50 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dpixel.c.o) - 0x00000000003023f4 _dpixel - .text 0x0000000000302444 0x54 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) - 0x0000000000302444 _dimage - 0x0000000000302478 _dsubimage - .text 0x0000000000302498 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) - 0x0000000000302498 _dupdate - 0x00000000003024b0 _dupdate_noint - .text 0x00000000003024bc 0x4c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) - 0x00000000003024bc _dclear - .text 0x0000000000302508 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) - .text 0x0000000000302508 0xc00 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - 0x0000000000302e30 _kprint_opt - 0x0000000000302f68 _kprint - 0x0000000000303040 _kvsprint - 0x0000000000303088 _sprintf - 0x00000000003030b0 _vsprintf - 0x00000000003030d0 _snprintf - 0x00000000003030f0 _vsnprintf - .text 0x0000000000303108 0xdc /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) - 0x0000000000303108 _memcpy - 0x00000000003031c2 __memmove - 0x00000000003031c6 __memcmp - 0x00000000003031ca _memset - .text 0x00000000003031e4 0x1d8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x000000000030327c _t6k11_display - 0x0000000000303350 _t6k11_contrast - 0x000000000030337c _t6k11_backlight - .text 0x00000000003033bc 0x1c8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) - 0x00000000003033bc _getkey_opt - 0x000000000030353c _getkey - 0x0000000000303548 _getkey_repeat - .text 0x0000000000303584 0x124 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) - 0x0000000000303590 _iokbd_row - 0x0000000000303678 _iokbd_scan - .text 0x00000000003036a8 0x170 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) - 0x000000000030375c _gint_install - 0x0000000000303800 _gint_unload - .text 0x0000000000303818 0x2c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) - 0x0000000000303818 _gint_setvbr - .text 0x0000000000303844 0x78 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) - 0x0000000000303844 _gint_intlevel - 0x0000000000303898 _gint_inthandler - .text 0x00000000003038bc 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - .text 0x00000000003038bc 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) - .text 0x00000000003038bc 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - .text 0x00000000003038bc 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) - .text 0x00000000003038bc 0x3b0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) - 0x00000000003038bc _bopti_grid - 0x0000000000303a12 _bopti_render - 0x0000000000303b18 _bopti_render_clip - 0x0000000000303c20 _bopti_render_noclip - .text 0x0000000000303c6c 0x9c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) - 0x0000000000303c6c _masks - .text 0x0000000000303d08 0x60 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) - 0x0000000000303d08 _bopti_asm_mono - 0x0000000000303d2e _bopti_asm_mono_alpha - 0x0000000000303d60 _bopti_asm_gray - 0x0000000000303d64 _bopti_asm_gray_alpha - .text 0x0000000000303d68 0x78 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) - 0x0000000000303d68 ___movstr - 0x0000000000303d68 ___movmem - 0x0000000000303d9c ___movmemSI64 - 0x0000000000303d9c ___movstrSI64 - 0x0000000000303da0 ___movstrSI60 - 0x0000000000303da0 ___movmemSI60 - 0x0000000000303da4 ___movmemSI56 - 0x0000000000303da4 ___movstrSI56 - 0x0000000000303da8 ___movstrSI52 - 0x0000000000303da8 ___movmemSI52 - 0x0000000000303dac ___movstrSI48 - 0x0000000000303dac ___movmemSI48 - 0x0000000000303db0 ___movstrSI44 - 0x0000000000303db0 ___movmemSI44 - 0x0000000000303db4 ___movstrSI40 - 0x0000000000303db4 ___movmemSI40 - 0x0000000000303db8 ___movstrSI36 - 0x0000000000303db8 ___movmemSI36 - 0x0000000000303dbc ___movmemSI32 - 0x0000000000303dbc ___movstrSI32 - 0x0000000000303dc0 ___movmemSI28 - 0x0000000000303dc0 ___movstrSI28 - 0x0000000000303dc4 ___movstrSI24 - 0x0000000000303dc4 ___movmemSI24 - 0x0000000000303dc8 ___movmemSI20 - 0x0000000000303dc8 ___movstrSI20 - 0x0000000000303dcc ___movstrSI16 - 0x0000000000303dcc ___movmemSI16 - 0x0000000000303dd0 ___movmemSI12 - 0x0000000000303dd0 ___movstrSI12 - 0x0000000000303dd4 ___movmemSI8 - 0x0000000000303dd4 ___movstrSI8 - 0x0000000000303dd8 ___movmemSI4 - 0x0000000000303dd8 ___movstrSI4 - .text 0x0000000000303de0 0xa0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_sdivsi3.o) - 0x0000000000303de0 ___sdivsi3 - .text 0x0000000000303e80 0x6c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) - 0x0000000000303ea2 ___udivsi3 - .text 0x0000000000303eec 0x1f0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) - 0x0000000000303eec ___udivdi3 - .text 0x00000000003040dc 0x348 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_addsub_df.o) - 0x0000000000304380 ___adddf3 - 0x00000000003043d0 ___subdf3 - .text 0x0000000000304424 0x208 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_mul_df.o) - 0x0000000000304424 ___muldf3 - .text 0x000000000030462c 0x130 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_div_df.o) - 0x000000000030462c ___divdf3 - .text 0x000000000030475c 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_gt_df.o) - 0x000000000030475c ___gtdf2 - .text 0x00000000003047b4 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_ge_df.o) - 0x00000000003047b4 ___gedf2 - .text 0x000000000030480c 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_lt_df.o) - 0x000000000030480c ___ltdf2 - .text 0x0000000000304864 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_le_df.o) - 0x0000000000304864 ___ledf2 - .text 0x00000000003048bc 0x98 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_si_to_df.o) - 0x00000000003048bc ___floatsidf - .text 0x0000000000304954 0x8c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_df_to_si.o) - 0x0000000000304954 ___fixdfsi - .text 0x00000000003049e0 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) - .text 0x00000000003049e0 0x60 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) - 0x00000000003049e0 ___udiv_qrnnd_16 - .text 0x0000000000304a40 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - .text 0x0000000000304a40 0x54 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clzsi2.o) - 0x0000000000304a40 ___clzsi2 - .text 0x0000000000304a94 0x240 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_pack_df.o) - 0x0000000000304a94 ___pack_d - .text 0x0000000000304cd4 0xcc /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_unpack_df.o) - 0x0000000000304cd4 ___unpack_d - .text 0x0000000000304da0 0xc8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_fpcmp_parts_df.o) - 0x0000000000304da0 ___fpcmp_parts_d + .text 0x000000000030168c 0xbc build-fx/src/FxEngine/zbuffer.o + 0x000000000030168c _FE_zbuffer_clear + 0x00000000003016f8 _FE_zbuffer_set_dist + .text 0x0000000000301748 0x0 build-fx/src/main.o + .text.startup 0x0000000000301748 0xa4 build-fx/src/main.o + 0x0000000000301748 _main + .text 0x00000000003017ec 0x74 build-fx/src/controls.o + 0x00000000003017ec _init_controls + 0x00000000003017fc _reload_fps_displaying + 0x0000000000301820 _display_fps + .text 0x0000000000301860 0x150 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x00000000003019a4 _clock_freq + .text 0x00000000003019b0 0x2c8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000301b54 _pollevent + 0x0000000000301c40 _waitevent + .text 0x0000000000301c78 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(hardware.c.o) + .text 0x0000000000301c78 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(syscalls.S.o) + .text 0x0000000000301c78 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(start.c.o) + .text 0x0000000000301c78 0x1f4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(mmu.c.o) + 0x0000000000301c78 _tlb_addr + 0x0000000000301c8c _tlb_data + 0x0000000000301ca0 _tlb_mapped_memory + 0x0000000000301d74 _utlb_addr + 0x0000000000301d84 _utlb_data + 0x0000000000301d94 _utlb_mapped_memory + .text 0x0000000000301e6c 0x56c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x000000000030218c _timer_setup + 0x000000000030221c _timer_delay + 0x000000000030227c _timer_start + 0x00000000003022b0 _timer_reload + 0x00000000003022d0 _timer_pause + 0x0000000000302304 _timer_stop + 0x0000000000302360 _timer_timeout + 0x000000000030236c _timer_address + 0x00000000003023a8 _timer_clear + .text 0x00000000003023d8 0x9c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x00000000003023d8 _dsize + .text 0x0000000000302474 0x50 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dpixel.c.o) + 0x0000000000302474 _dpixel + .text 0x00000000003024c4 0x54 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dimage.c.o) + 0x00000000003024c4 _dimage + 0x00000000003024f8 _dsubimage + .text 0x0000000000302518 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dupdate.c.o) + 0x0000000000302518 _dupdate + 0x0000000000302530 _dupdate_noint + .text 0x000000000030253c 0x4c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(dclear.c.o) + 0x000000000030253c _dclear + .text 0x0000000000302588 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + .text 0x0000000000302588 0xc00 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + 0x0000000000302eb0 _kprint_opt + 0x0000000000302fe8 _kprint + 0x00000000003030c0 _kvsprint + 0x0000000000303108 _sprintf + 0x0000000000303130 _vsprintf + 0x0000000000303150 _snprintf + 0x0000000000303170 _vsnprintf + .text 0x0000000000303188 0xdc /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(memory.c.o) + 0x0000000000303188 _memcpy + 0x0000000000303242 __memmove + 0x0000000000303246 __memcmp + 0x000000000030324a _memset + .text 0x0000000000303264 0x1d8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x00000000003032fc _t6k11_display + 0x00000000003033d0 _t6k11_contrast + 0x00000000003033fc _t6k11_backlight + .text 0x000000000030343c 0x1c8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(getkey.c.o) + 0x000000000030343c _getkey_opt + 0x00000000003035bc _getkey + 0x00000000003035c8 _getkey_repeat + .text 0x0000000000303604 0x124 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(iokbd.c.o) + 0x0000000000303610 _iokbd_row + 0x00000000003036f8 _iokbd_scan + .text 0x0000000000303728 0x170 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(setup.c.o) + 0x00000000003037dc _gint_install + 0x0000000000303880 _gint_unload + .text 0x0000000000303898 0x2c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(vbr.s.o) + 0x0000000000303898 _gint_setvbr + .text 0x00000000003038c4 0x78 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(gint.c.o) + 0x00000000003038c4 _gint_intlevel + 0x0000000000303918 _gint_inthandler + .text 0x000000000030393c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + .text 0x000000000030393c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) + .text 0x000000000030393c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + .text 0x000000000030393c 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti-asm.s.o) + .text 0x000000000030393c 0x3b0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti.c.o) + 0x000000000030393c _bopti_grid + 0x0000000000303a92 _bopti_render + 0x0000000000303b98 _bopti_render_clip + 0x0000000000303ca0 _bopti_render_noclip + .text 0x0000000000303cec 0x9c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(masks.c.o) + 0x0000000000303cec _masks + .text 0x0000000000303d88 0x60 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(bopti-asm.s.o) + 0x0000000000303d88 _bopti_asm_mono + 0x0000000000303dae _bopti_asm_mono_alpha + 0x0000000000303de0 _bopti_asm_gray + 0x0000000000303de4 _bopti_asm_gray_alpha + .text 0x0000000000303de8 0x78 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_movmem.o) + 0x0000000000303de8 ___movstr + 0x0000000000303de8 ___movmem + 0x0000000000303e1c ___movmemSI64 + 0x0000000000303e1c ___movstrSI64 + 0x0000000000303e20 ___movstrSI60 + 0x0000000000303e20 ___movmemSI60 + 0x0000000000303e24 ___movmemSI56 + 0x0000000000303e24 ___movstrSI56 + 0x0000000000303e28 ___movstrSI52 + 0x0000000000303e28 ___movmemSI52 + 0x0000000000303e2c ___movstrSI48 + 0x0000000000303e2c ___movmemSI48 + 0x0000000000303e30 ___movstrSI44 + 0x0000000000303e30 ___movmemSI44 + 0x0000000000303e34 ___movstrSI40 + 0x0000000000303e34 ___movmemSI40 + 0x0000000000303e38 ___movstrSI36 + 0x0000000000303e38 ___movmemSI36 + 0x0000000000303e3c ___movmemSI32 + 0x0000000000303e3c ___movstrSI32 + 0x0000000000303e40 ___movmemSI28 + 0x0000000000303e40 ___movstrSI28 + 0x0000000000303e44 ___movstrSI24 + 0x0000000000303e44 ___movmemSI24 + 0x0000000000303e48 ___movmemSI20 + 0x0000000000303e48 ___movstrSI20 + 0x0000000000303e4c ___movstrSI16 + 0x0000000000303e4c ___movmemSI16 + 0x0000000000303e50 ___movmemSI12 + 0x0000000000303e50 ___movstrSI12 + 0x0000000000303e54 ___movmemSI8 + 0x0000000000303e54 ___movstrSI8 + 0x0000000000303e58 ___movmemSI4 + 0x0000000000303e58 ___movstrSI4 + .text 0x0000000000303e60 0xa0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_sdivsi3.o) + 0x0000000000303e60 ___sdivsi3 + .text 0x0000000000303f00 0x6c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivsi3.o) + 0x0000000000303f22 ___udivsi3 + .text 0x0000000000303f6c 0x1f0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udivdi3.o) + 0x0000000000303f6c ___udivdi3 + .text 0x000000000030415c 0x348 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_addsub_df.o) + 0x0000000000304400 ___adddf3 + 0x0000000000304450 ___subdf3 + .text 0x00000000003044a4 0x208 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_mul_df.o) + 0x00000000003044a4 ___muldf3 + .text 0x00000000003046ac 0x130 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_div_df.o) + 0x00000000003046ac ___divdf3 + .text 0x00000000003047dc 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_gt_df.o) + 0x00000000003047dc ___gtdf2 + .text 0x0000000000304834 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_ge_df.o) + 0x0000000000304834 ___gedf2 + .text 0x000000000030488c 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_lt_df.o) + 0x000000000030488c ___ltdf2 + .text 0x00000000003048e4 0x58 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_le_df.o) + 0x00000000003048e4 ___ledf2 + .text 0x000000000030493c 0x98 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_si_to_df.o) + 0x000000000030493c ___floatsidf + .text 0x00000000003049d4 0x8c /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_df_to_si.o) + 0x00000000003049d4 ___fixdfsi + .text 0x0000000000304a60 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) + .text 0x0000000000304a60 0x60 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_udiv_qrnnd_16.o) + 0x0000000000304a60 ___udiv_qrnnd_16 + .text 0x0000000000304ac0 0x0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + .text 0x0000000000304ac0 0x54 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clzsi2.o) + 0x0000000000304ac0 ___clzsi2 + .text 0x0000000000304b14 0x240 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_pack_df.o) + 0x0000000000304b14 ___pack_d + .text 0x0000000000304d54 0xcc /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_unpack_df.o) + 0x0000000000304d54 ___unpack_d + .text 0x0000000000304e20 0xc8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_fpcmp_parts_df.o) + 0x0000000000304e20 ___fpcmp_parts_d *(C P) -.gint.blocks 0x0000000000304e70 0x140 +.gint.blocks 0x0000000000304ef0 0x140 *(.gint.blocks) - .gint.blocks 0x0000000000304e70 0x40 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) - 0x0000000000304e70 _inth_entry_7305 - 0x0000000000304e90 _inth_entry_7705 - .gint.blocks 0x0000000000304eb0 0x20 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) - 0x0000000000304eb0 _exch_entry_7705 - 0x0000000000304eb0 _exch_entry_7305 - .gint.blocks 0x0000000000304ed0 0xe0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) - 0x0000000000304ed0 _inth_tmu - 0x0000000000304f50 _inth_etmu2 - 0x0000000000304f70 _inth_etmu_help - 0x0000000000304f90 _inth_etmux + .gint.blocks 0x0000000000304ef0 0x40 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.S.o) + 0x0000000000304ef0 _inth_entry_7305 + 0x0000000000304f10 _inth_entry_7705 + .gint.blocks 0x0000000000304f30 0x20 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(exch.S.o) + 0x0000000000304f30 _exch_entry_7705 + 0x0000000000304f30 _exch_entry_7305 + .gint.blocks 0x0000000000304f50 0xe0 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(inth.s.o) + 0x0000000000304f50 _inth_tmu + 0x0000000000304fd0 _inth_etmu2 + 0x0000000000304ff0 _inth_etmu_help + 0x0000000000305010 _inth_etmux -.gint.drivers 0x0000000000304fb0 0x90 - 0x0000000000304fb0 _bdrv = . +.gint.drivers 0x0000000000305030 0x90 + 0x0000000000305030 _bdrv = . *(.gint.drivers.0) *(.gint.drivers.1) .gint.drivers.1 - 0x0000000000304fb0 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) - 0x0000000000304fb0 _drv_cpg + 0x0000000000305030 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000305030 _drv_cpg *(.gint.drivers.2) .gint.drivers.2 - 0x0000000000304fd4 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - 0x0000000000304fd4 _drv_tmu + 0x0000000000305054 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + 0x0000000000305054 _drv_tmu *(.gint.drivers.3) *(.gint.drivers.4) .gint.drivers.4 - 0x0000000000304ff8 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - 0x0000000000304ff8 _drv_keysc + 0x0000000000305078 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + 0x0000000000305078 _drv_keysc *(.gint.drivers.5) .gint.drivers.5 - 0x000000000030501c 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) - 0x000000000030501c _drv_t6k11 + 0x000000000030509c 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x000000000030509c _drv_t6k11 *(.gint.drivers.6) - 0x0000000000305040 _edrv = . + 0x00000000003050c0 _edrv = . -.rodata 0x0000000000305040 0x854 +.rodata 0x00000000003050c0 0x854 *(.rodata .rodata.*) - .rodata 0x0000000000305040 0x10 build-fx/src/FxEngine/texture.o - 0x0000000000305040 _FE_textures - .rodata 0x0000000000305050 0x18 build-fx/src/FxEngine/coord.o - 0x0000000000305050 _pi_sur2 - 0x0000000000305058 _pi2 - 0x0000000000305060 _pi + .rodata 0x00000000003050c0 0x10 build-fx/src/FxEngine/texture.o + 0x00000000003050c0 _FE_textures + .rodata 0x00000000003050d0 0x18 build-fx/src/FxEngine/coord.o + 0x00000000003050d0 _pi_sur2 + 0x00000000003050d8 _pi2 + 0x00000000003050e0 _pi .rodata.str1.4 - 0x0000000000305068 0x9 build-fx/src/FxEngine/FxEngine.o - *fill* 0x0000000000305071 0x3 + 0x00000000003050e8 0x9 build-fx/src/FxEngine/FxEngine.o + *fill* 0x00000000003050f1 0x3 .rodata.str1.4 - 0x0000000000305074 0x12 build-fx/src/FxEngine/zbuffer.o - *fill* 0x0000000000305086 0x2 - .rodata 0x0000000000305088 0x60 build-fx/src/main.o + 0x00000000003050f4 0x12 build-fx/src/FxEngine/zbuffer.o + *fill* 0x0000000000305106 0x2 + .rodata 0x0000000000305108 0x60 build-fx/src/main.o .rodata.str1.4 - 0x00000000003050e8 0x3 build-fx/src/controls.o - *fill* 0x00000000003050eb 0x1 - .rodata 0x00000000003050ec 0x24 build-fx/assets/img/fps.png.o - 0x00000000003050ec _img_fps - 0x0000000000305110 _img_fps_end - .rodata 0x0000000000305110 0x204 build-fx/assets/fonts/FxEngine.png.o - 0x0000000000305110 _font_FxEngine - 0x0000000000305314 _font_FxEngine_end + 0x0000000000305168 0x3 build-fx/src/controls.o + *fill* 0x000000000030516b 0x1 + .rodata 0x000000000030516c 0x24 build-fx/assets/img/fps.png.o + 0x000000000030516c _img_fps + 0x0000000000305190 _img_fps_end + .rodata 0x0000000000305190 0x204 build-fx/assets/fonts/FxEngine.png.o + 0x0000000000305190 _font_FxEngine + 0x0000000000305394 _font_FxEngine_end .rodata.str1.4 - 0x0000000000305314 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) + 0x0000000000305394 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) .rodata.str1.4 - 0x0000000000305318 0x6 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) - *fill* 0x000000000030531e 0x2 + 0x0000000000305398 0x6 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) + *fill* 0x000000000030539e 0x2 .rodata.str1.4 - 0x0000000000305320 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) - .rodata 0x0000000000305324 0x18 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) + 0x00000000003053a0 0x4 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(tmu.c.o) + .rodata 0x00000000003053a4 0x18 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(topti.c.o) .rodata.str1.4 - 0x000000000030533c 0x31 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) - *fill* 0x000000000030536d 0x3 + 0x00000000003053bc 0x31 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(stdio.c.o) + *fill* 0x00000000003053ed 0x3 .rodata.str1.4 - 0x0000000000305370 0x8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) + 0x00000000003053f0 0x8 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(t6k11.c.o) 0x6 (size before relaxing) - .rodata 0x0000000000305378 0x408 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) - 0x0000000000305378 _gint_font5x7 - 0x0000000000305780 _gint_font5x7_end - .rodata 0x0000000000305780 0x14 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) - 0x0000000000305780 ___thenan_df - .rodata 0x0000000000305794 0x100 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) - 0x0000000000305794 ___clz_tab + .rodata 0x00000000003053f8 0x408 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(font5x7.png.o) + 0x00000000003053f8 _gint_font5x7 + 0x0000000000305800 _gint_font5x7_end + .rodata 0x0000000000305800 0x14 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_thenan_df.o) + 0x0000000000305800 ___thenan_df + .rodata 0x0000000000305814 0x100 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a(_clz.o) + 0x0000000000305814 ___clz_tab -.rela.dyn 0x0000000000305894 0x0 - .rela.text 0x0000000000305894 0x0 build-fx/src/FxEngine/coord.o +.rela.dyn 0x0000000000305914 0x0 + .rela.text 0x0000000000305914 0x0 build-fx/src/FxEngine/coord.o .rela.pretext.entry - 0x0000000000305894 0x0 build-fx/src/FxEngine/coord.o + 0x0000000000305914 0x0 build-fx/src/FxEngine/coord.o 0x0000000008100000 . = ORIGIN (ram) .bss 0x0000000008100000 0x5b0 @@ -688,8 +688,8 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *fill* 0x00000000081005ac 0x4 0x00000000000005b0 _sbss = SIZEOF (.bss) -.data 0x00000000081005b0 0x110 load address 0x0000000000305894 - 0x0000000000305894 _ldata = LOADADDR (.data) +.data 0x00000000081005b0 0x110 load address 0x0000000000305914 + 0x0000000000305914 _ldata = LOADADDR (.data) 0x00000000081005b0 _rdata = . *(.data .data.*) .data 0x00000000081005b0 0x0 build-fx/src/FxEngine/libprof.o @@ -755,15 +755,15 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a *(D) 0x00000000081006c0 . = ALIGN (0x10) -.data.4 0x00000000081006c0 0x0 load address 0x00000000003059a4 +.data.4 0x00000000081006c0 0x0 load address 0x0000000000305a24 *(.data.4) 0x00000000081006c0 . = ALIGN (0x10) 0x0000000000000110 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x000000008800df00 _gint_vbr = 0x8800df00 0x000000008800f400 . = ORIGIN (rram) -.gint.data 0x000000008800f400 0x130 load address 0x00000000003059a4 - 0x00000000003059a4 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008800f400 0x130 load address 0x0000000000305a24 + 0x0000000000305a24 _lgdata = LOADADDR (.gint.data) 0x000000008800f400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008800f400 0x18 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) @@ -781,7 +781,7 @@ LOAD /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgcc.a 0x000000008800f530 . = ALIGN (0x10) 0x0000000000000130 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008800f530 0x210 load address 0x0000000000305ad4 +.gint.bss 0x000000008800f530 0x210 load address 0x0000000000305b54 *(.gint.bss .gint.bss.*) .gint.bss 0x000000008800f530 0x24 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(cpg.c.o) .gint.bss 0x000000008800f554 0x100 /home/util1/Bureau/MILAN/gcc/lib/gcc/sh3eb-elf/9.1.0/libgint-fx.a(keysc.c.o) diff --git a/build-fx/src/FxEngine/1v13D.bin b/build-fx/src/FxEngine/1v13D.bin index 47968d3..9746658 100755 Binary files a/build-fx/src/FxEngine/1v13D.bin and b/build-fx/src/FxEngine/1v13D.bin differ diff --git a/build-fx/src/FxEngine/1v13D.elf b/build-fx/src/FxEngine/1v13D.elf index 6c53050..3f013a6 100755 Binary files a/build-fx/src/FxEngine/1v13D.elf and b/build-fx/src/FxEngine/1v13D.elf differ diff --git a/build-fx/src/FxEngine/face.o b/build-fx/src/FxEngine/face.o index 29c3411..80cdda3 100644 Binary files a/build-fx/src/FxEngine/face.o and b/build-fx/src/FxEngine/face.o differ diff --git a/build-fx/src/FxEngine/zbuffer.o b/build-fx/src/FxEngine/zbuffer.o index 7f3f825..65dc9f3 100644 Binary files a/build-fx/src/FxEngine/zbuffer.o and b/build-fx/src/FxEngine/zbuffer.o differ diff --git a/src/FxEngine/face.c b/src/FxEngine/face.c index 08edd6e..6d1a065 100644 --- a/src/FxEngine/face.c +++ b/src/FxEngine/face.c @@ -6,19 +6,20 @@ #define min(x,y) (xy?x:y) -static bool compare(FE_face const * face) +static bool sens_horaire(FE_face const * face) { - const int dx_1=face->s2->translated.x-face->s1->translated.x; - const int dx_2=face->s3->translated.x-face->s1->translated.x; - const int dy_1=face->s2->translated.y-face->s1->translated.y; - const int dy_2=face->s3->translated.y-face->s1->translated.y; + int area = 0; - double coef1,coef2; - if (dx_1==0) coef1=10000*dy_1; - else coef1=dy_1/dx_1; - if (dx_2==0) coef2=10000*dy_2; - else coef2=dy_2/dx_2; - return (coef1s1->translated.x*face->s2->translated.y; + area-=face->s2->translated.x*face->s1->translated.y; + + area+=face->s2->translated.x*face->s3->translated.y; + area-=face->s3->translated.x*face->s2->translated.y; + + area+=face->s3->translated.x*face->s1->translated.y; + area-=face->s1->translated.x*face->s3->translated.y; + + return (area < 0); } @@ -36,8 +37,8 @@ void FE_draw_face(FE_face const * face) return; if (face->s1->translated.y>63 && face->s2->translated.y>63 && face->s3->translated.y>63) return; - /*if (compare(face)!=face->visible) - return;*/ + if (sens_horaire(face)!=face->visible) + return; const int xmin=max(min(face->s1->translated.x,min(face->s2->translated.x,face->s3->translated.x)),0); diff --git a/src/FxEngine/zbuffer.c b/src/FxEngine/zbuffer.c index 305c861..54eed16 100644 --- a/src/FxEngine/zbuffer.c +++ b/src/FxEngine/zbuffer.c @@ -22,7 +22,7 @@ void FE_zbuffer_clear() int indice=0; // TODO ** ajouter le DMA pour les architectures sh4 for (indice=0; indice<4096; indice++) - address[indice]=0; + address[indice]=3000; } bool FE_zbuffer_set_dist(int x, int y, int dist) @@ -30,7 +30,7 @@ bool FE_zbuffer_set_dist(int x, int y, int dist) x%=FE_ZB_SIZE_X; y%=FE_ZB_SIZE_Y; const int indice=x*y; - if (address[indice]==0 || address[indice]>dist) + if (address[indice]>dist&&dist>0) { address[indice]=dist; return true;