Macintosh-Tools/gb6
1
0
Fork 0
mirror of https://github.com/mlaux/gb6.git synced 2024-06-07 07:29:34 +00:00
Code Issues Projects Releases Wiki Activity

more relative jumps

Browse Source
This commit is contained in:
Matt Laux 2019-04-25 00:29:42 -05:00
parent b6966cb605
commit a9696e5c7c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cpu.c
View File

@ -240,9 +240,10 @@ static void subtract(struct cpu *cpu, u8 value, int with_carry, int just_compare
static void push(struct cpu *cpu, u16 value) static void push(struct cpu *cpu, u16 value)
{ {
printf("sp=%04x\n", cpu->sp); // todo #if DEBUG or something
printf("memory[sp-2] = %02x\n", value & 0xff); //printf("sp=%04x\n", cpu->sp);
printf("memory[sp-1] = %02x\n", value >> 8); //printf("memory[sp-2] = %02x\n", value & 0xff);
//printf("memory[sp-1] = %02x\n", value >> 8);
write8(cpu, cpu->sp - 2, value & 0xff); write8(cpu, cpu->sp - 2, value & 0xff);
write8(cpu, cpu->sp - 1, value >> 8); write8(cpu, cpu->sp - 1, value >> 8);
cpu->sp -= 2; cpu->sp -= 2;
@ -251,9 +252,9 @@ static void push(struct cpu *cpu, u16 value)
static u16 pop(struct cpu *cpu) static u16 pop(struct cpu *cpu)
{ {
cpu->sp += 2; cpu->sp += 2;
printf("sp=%04x\n", cpu->sp); //printf("sp=%04x\n", cpu->sp);
printf("read memory[sp-2] = %02x\n", read8(cpu, cpu->sp - 2)); //printf("read memory[sp-2] = %02x\n", read8(cpu, cpu->sp - 2));
printf("read memory[sp-1] = %02x\n", read8(cpu, cpu->sp - 1)); //printf("read memory[sp-1] = %02x\n", read8(cpu, cpu->sp - 1));
return read8(cpu, cpu->sp - 1) << 8 | read8(cpu, cpu->sp - 2); return read8(cpu, cpu->sp - 1) << 8 | read8(cpu, cpu->sp - 2);
} }
@ -516,9 +517,14 @@ void cpu_step(struct cpu *cpu)
case 0x12: // LD (DE),A case 0x12: // LD (DE),A
write8(cpu, read_de(cpu), cpu->a); write8(cpu, read_de(cpu), cpu->a);
break; break;
case 0x20: // JR NZ,r8 case 0x18: // JR r8
temp = read8(cpu, cpu->pc); temp = read8(cpu, cpu->pc);
if (!flag_isset(cpu, FLAG_ZERO)) { cpu->pc += *((signed char *) &temp) + 1;
break;
case 0x20: // JR NZ,r8
case 0x28: // JR Z,r8
temp = read8(cpu, cpu->pc);
if ((opc == 0x20) ^ flag_isset(cpu, FLAG_ZERO)) {
cpu->pc += *((signed char *) &temp) + 1; cpu->pc += *((signed char *) &temp) + 1;
} else { } else {
cpu->pc++; cpu->pc++;