Skip to content
Permalink
Browse files

Merged with coreupdate branch, so now the master branch has improved …

…IRQ and SA-1. / Remove i386 asm codes.
  • Loading branch information...
zones
zones committed Jan 16, 2011
2 parents f918834 + 52defdc commit 82435ab5db52b5e523951aa278fbc3ddc25cc173
Showing with 645 additions and 16,240 deletions.
  1. +0 −11 c4.cpp
  2. +0 −13 c4.h
  3. +0 −6 cheats2.cpp
  4. +0 −6 controls.cpp
  5. +7 −7 cpu.cpp
  6. +89 −134 cpuexec.cpp
  7. +30 −71 cpuexec.h
  8. +0 −13 cpumacro.h
  9. +14 −155 cpuops.cpp
  10. +5 −4 cpuops.h
  11. +2 −2 debug.cpp
  12. +3 −15 dma.cpp
  13. +2 −16 docs/porting.html
  14. +0 −3 docs/snes9x.conf.default
  15. +4 −6 fxemu.cpp
  16. +4 −32 fxemu.h
  17. +0 −4 fxinst.h
  18. +4 −62 getset.h
  19. +2 −13 globals.cpp
  20. +0 −2,390 i386/c4.asm
  21. +0 −2,692 i386/fxemu2.asm
  22. +0 −834 i386/fxemu2.mac
  23. +0 −617 i386/fxemu2b.asm
  24. +0 −88 i386/fxemu2b.mac
  25. +0 −2,557 i386/fxemu2c.asm
  26. +0 −528 i386/fxemu2c.mac
  27. +0 −3,557 i386/fxtable.asm
  28. +0 −80 i386/macros.mac
  29. +0 −101 i386/regs.mac
  30. +0 −51 i386/regsw.mac
  31. +0 −678 i386/sfxproc.asm
  32. +0 −376 i386/zsnes.asm
  33. +0 −92 i386/zsnesc4.asm
  34. +2 −266 memmap.cpp
  35. +0 −8 memmap.h
  36. +23 −259 ppu.cpp
  37. +0 −12 ppu.h
  38. +238 −277 sa1.cpp
  39. +14 −18 sa1.h
  40. +116 −19 sa1cpu.cpp
  41. +66 −48 snapshot.cpp
  42. +1 −1 snapshot.h
  43. +0 −15 snes9x.cpp
  44. +13 −25 snes9x.h
  45. +4 −25 unix/Makefile.in
  46. +2 −52 unix/configure.ac
  47. +0 −1 unix/x11.cpp
11 c4.cpp
@@ -328,14 +328,3 @@ uint8 * S9xGetMemPointerC4 (uint16 Address)
return (NULL);
return (Memory.C4RAM - 0x6000 + (Address & 0xffff));
}

#ifdef ZSNES_C4
START_EXTERN_C

void C4LoaDMem (char *C4RAM)
{
memmove(C4RAM + (READ_WORD(C4RAM + 0x1f45) & 0x1fff), C4GetMemPointer(READ_3WORD(C4RAM + 0x1f40)), READ_WORD(C4RAM + 0x1f43));
}

END_EXTERN_C
#endif
13 c4.h
@@ -178,10 +178,6 @@
#ifndef _C4_H_
#define _C4_H_

#ifdef ZSNES_C4
START_EXTERN_C
#endif

extern int16 C4WFXVal;
extern int16 C4WFYVal;
extern int16 C4WFZVal;
@@ -195,10 +191,6 @@ extern int16 C41FAngleRes;
extern int16 C41FDist;
extern int16 C41FDistVal;

#ifdef ZSNES_C4
extern uint8 *C4Ram;
#endif

void C4TransfWireFrame (void);
void C4TransfWireFrame2 (void);
void C4CalcWireFrame (void);
@@ -208,11 +200,6 @@ void C4Op1F (void);
void S9xInitC4 (void);
void S9xSetC4 (uint8, uint16);
uint8 S9xGetC4 (uint16);

#ifdef ZSNES_C4
END_EXTERN_C
#endif

uint8 * S9xGetBasePointerC4 (uint16);
uint8 * S9xGetMemPointerC4 (uint16);

@@ -186,12 +186,9 @@ static void S9xSetByteFree (uint8, uint32);
static uint8 S9xGetByteFree (uint32 address)
{
uint32 Cycles = CPU.Cycles;
uint32 WaitAddress = CPU.WaitAddress;
uint8 byte;

byte = S9xGetByte(address);

CPU.WaitAddress = WaitAddress;
CPU.Cycles = Cycles;

return (byte);
@@ -200,11 +197,8 @@ static uint8 S9xGetByteFree (uint32 address)
static void S9xSetByteFree (uint8 byte, uint32 address)
{
uint32 Cycles = CPU.Cycles;
uint32 WaitAddress = CPU.WaitAddress;

S9xSetByte(byte, address);

CPU.WaitAddress = WaitAddress;
CPU.Cycles = Cycles;
}

@@ -425,7 +425,6 @@ static const int ptrspeeds[4] = { 1, 1, 4, 8 };
S(ToggleBG2), \
S(ToggleBG3), \
S(ToggleEmuTurbo), \
S(ToggleHDMA), \
S(ToggleSprites), \
S(ToggleTransparency) \

@@ -2454,11 +2453,6 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
DisplayStateChange("Sprites", !(Settings.BG_Forced & 16));
break;

case ToggleHDMA:
Settings.DisableHDMA = !Settings.DisableHDMA;
DisplayStateChange("HDMA emulation", !Settings.DisableHDMA);
break;

case ToggleTransparency:
Settings.Transparency = !Settings.Transparency;
DisplayStateChange("Transparency effects", Settings.Transparency);
14 cpu.cpp
@@ -208,12 +208,16 @@ static void S9xResetCPU (void)
static void S9xSoftResetCPU (void)
{
CPU.Cycles = 182; // Or 188. This is the cycle count just after the jump to the Reset Vector.
CPU.PrevCycles = -1;
CPU.PrevCycles = CPU.Cycles;
CPU.V_Counter = 0;
CPU.Flags = CPU.Flags & (DEBUG_MODE_FLAG | TRACE_FLAG);
CPU.PCBase = NULL;
CPU.IRQActive = FALSE;
CPU.IRQPending = 0;
CPU.NMILine = FALSE;
CPU.IRQLine = FALSE;
CPU.IRQTransition = FALSE;
CPU.IRQLastState = FALSE;
CPU.IRQExternal = FALSE;
CPU.IRQPending = Timings.IRQPendCount;
CPU.MemSpeed = SLOW_ONE_CYCLE;
CPU.MemSpeedx2 = SLOW_ONE_CYCLE * 2;
CPU.FastROMSpeed = SLOW_ONE_CYCLE;
@@ -226,9 +230,6 @@ static void S9xSoftResetCPU (void)
CPU.WhichEvent = HC_RENDER_EVENT;
CPU.NextEvent = Timings.RenderPos;
CPU.WaitingForInterrupt = FALSE;
CPU.WaitAddress = 0xffffffff;
CPU.WaitCounter = 0;
CPU.PBPCAtOpcodeStart = 0xffffffff;
CPU.AutoSaveTimer = 0;
CPU.SRAMModified = FALSE;

@@ -261,7 +262,6 @@ static void S9xSoftResetCPU (void)

ICPU.S9xOpcodes = S9xOpcodesE1;
ICPU.S9xOpLengths = S9xOpLengthsM1X1;
ICPU.CPUExecuting = TRUE;

S9xUnpackStatus();
}
Oops, something went wrong.

0 comments on commit 82435ab

Please sign in to comment.
You can’t perform that action at this time.