# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1516687435 28800
# Node ID 9136b7ea1ccb6129e48e24be603153d7a79928e4
# Parent  aaab852803acea990bbc5d7e726b25875c78c721# Parent  8158c27576059b7620c1bbe6cc1acd35fc018d68
Merge

diff -r aaab852803ac -r 9136b7ea1ccb Makefile
--- a/Makefile	Mon Jan 22 22:02:29 2018 -0800
+++ b/Makefile	Mon Jan 22 22:03:55 2018 -0800
@@ -65,18 +65,18 @@
 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 @@
 	$(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 @@
 	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 @@
 	$(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 -r aaab852803ac -r 9136b7ea1ccb backend_x86.c
--- a/backend_x86.c	Mon Jan 22 22:02:29 2018 -0800
+++ b/backend_x86.c	Mon Jan 22 22:03:55 2018 -0800
@@ -244,7 +244,7 @@
 						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 -r aaab852803ac -r 9136b7ea1ccb m68k_core_x86.c
--- a/m68k_core_x86.c	Mon Jan 22 22:02:29 2018 -0800
+++ b/m68k_core_x86.c	Mon Jan 22 22:03:55 2018 -0800
@@ -2365,7 +2365,7 @@
 	}
 	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);