diff options
| author | Michael Pavone <pavone@retrodev.com> | 2018-01-22 22:03:55 -0800 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2018-01-22 22:03:55 -0800 |
| commit | 06373e75346f03c04a438c79ec4cf2f4a5095720 (patch) | |
| tree | 7d83fe4696ab663610b4d30e3e47b68cc4bee0aa | |
| parent | 05fcf797a7f77537f18c760dfb0bec783dbd9981 (diff) | |
| parent | 01e918692c93eea9e52b296cb27e227d4cd1fed0 (diff) | |
Merge
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | backend_x86.c | 2 | ||||
| -rw-r--r-- | m68k_core_x86.c | 2 |
3 files changed, 12 insertions, 12 deletions
@@ -65,18 +65,18 @@ endif #PORTABLE endif #Windows ifdef DEBUG -CFLAGS:=-ggdb $(CFLAGS) -LDFLAGS:=-ggdb $(LDFLAGS) +OPT:=-ggdb -Og else ifdef NOLTO -CFLAGS:=-O2 $(CFLAGS) -LDFLAGS:=-O2 $(LDFLAGS) +OPT:=-O2 else -CFLAGS:=-O2 -flto $(CFLAGS) -LDFLAGS:=-O2 -flto $(LDFLAGS) +OPT:=-O2 -flto endif #NOLTO endif #DEBUG +CFLAGS:=$(OPT) $(CFLAGS) +LDFLAGS:=$(OPT) $(LDFLAGS) + ifdef Z80_LOG_ADDRESS CFLAGS+= -DZ80_LOG_ADDRESS endif @@ -166,7 +166,7 @@ blastjag$(EXE) : jaguar.o jag_video.o render_sdl.o serialize.o $(M68KOBJS) $(TRA $(CC) -o $@ $^ $(LDFLAGS) dis$(EXE) : dis.o 68kinst.o tern.o vos_program_module.o - $(CC) -o $@ $^ + $(CC) -o $@ $^ $(OPT) jagdis : jagdis.o jagcpu.o tern.o $(CC) -o $@ $^ @@ -178,13 +178,13 @@ libemu68k.a : $(M68KOBJS) $(TRANSOBJS) ar rcs libemu68k.a $(M68KOBJS) $(TRANSOBJS) trans : trans.o serialize.o $(M68KOBJS) $(TRANSOBJS) util.o - $(CC) -o trans trans.o $(M68KOBJS) $(TRANSOBJS) util.o + $(CC) -o trans trans.o $(M68KOBJS) $(TRANSOBJS) util.o $(OPT) transz80 : transz80.o $(Z80OBJS) $(TRANSOBJS) $(CC) -o transz80 transz80.o $(Z80OBJS) $(TRANSOBJS) ztestrun : ztestrun.o serialize.o $(Z80OBJS) $(TRANSOBJS) - $(CC) -o ztestrun ztestrun.o $(Z80OBJS) $(TRANSOBJS) + $(CC) -o ztestrun ztestrun.o $(Z80OBJS) $(TRANSOBJS) $(OPT) ztestgen : ztestgen.o z80inst.o $(CC) -ggdb -o ztestgen ztestgen.o z80inst.o @@ -198,7 +198,7 @@ vgmplay$(EXE) : vgmplay.o render_sdl.o ppm.o serialize.o $(CONFIGOBJS) $(AUDIOOB $(FIXUP) ./$@ blastcpm : blastcpm.o util.o serialize.o $(Z80OBJS) $(TRANSOBJS) - $(CC) -o $@ $^ + $(CC) -o $@ $^ $(OPT) test : test.o vdp.o $(CC) -o test test.o vdp.o diff --git a/backend_x86.c b/backend_x86.c index 614df1b..9458499 100644 --- a/backend_x86.c +++ b/backend_x86.c @@ -244,7 +244,7 @@ code_ptr gen_mem_fun(cpu_options * opts, memmap_chunk const * memmap, uint32_t n if (is_write && (memmap[chunk].flags & MMAP_CODE)) { pop_r(code, opts->scratch2); } else { - add_ir(code, sizeof(void*), RSP, SZ_D); + add_ir(code, sizeof(void*), RSP, SZ_PTR); code->stack_off -= sizeof(void *); } } else { diff --git a/m68k_core_x86.c b/m68k_core_x86.c index 1f9a511..6fa1dce 100644 --- a/m68k_core_x86.c +++ b/m68k_core_x86.c @@ -2365,7 +2365,7 @@ void translate_m68k_stop(m68k_options *opts, m68kinst *inst) } code_ptr loop_top = code->cur; call(code, opts->do_sync); - cmp_rr(code, opts->gen.limit, opts->gen.cycles, SZ_D); + cmp_rr(code, opts->gen.cycles, opts->gen.limit, SZ_D); code_ptr normal_cycle_up = code->cur + 1; jcc(code, CC_A, code->cur + 2); cycles(&opts->gen, BUS); |