mirror of
https://github.com/libretro/fixGB.git
synced 2024-11-23 09:09:40 +00:00
more general code changes
This commit is contained in:
FIX94
parent
dd173107d9
commit
e514ebf3dc
6
apu.c
6
apu.c
@ -9,6 +9,7 @@
|
||||
#include <stdbool.h>
|
||||
#include <inttypes.h>
|
||||
#include <malloc.h>
|
||||
#include <string.h>
|
||||
#include "apu.h"
|
||||
#include "audio.h"
|
||||
#include "mem.h"
|
||||
@ -228,12 +229,11 @@ bool apuCycle()
|
||||
else
|
||||
noiseOut = 0;
|
||||
}
|
||||
//should be 60.f at max but that'd be way too quiet after LP and HP
|
||||
float curIn = ((float)(p1Out + p2Out + wavOut + noiseOut))/45.f;
|
||||
float curIn = ((float)(p1Out + p2Out + wavOut + noiseOut))/60.f;
|
||||
float curLPout = lastLPOut[apuCurChan]+(lpVal*(curIn-lastLPOut[apuCurChan]));
|
||||
float curHPOut = hpVal*(lastHPOut[apuCurChan]+curLPout-curIn);
|
||||
//set output
|
||||
apuOutBuf[curBufPos] = soundEnabled?(-curHPOut):0;
|
||||
apuOutBuf[curBufPos] = ((soundEnabled)?(curHPOut):0);
|
||||
lastLPOut[apuCurChan] = curLPout;
|
||||
lastHPOut[apuCurChan] = curHPOut;
|
||||
curBufPos++;
|
||||
|
||||
4
cpu.c
4
cpu.c
@ -1618,13 +1618,13 @@ void cpuSetSpeed(bool cgb)
|
||||
{
|
||||
printf("CPU: CGB Speed\n");
|
||||
cpuCgbSpeed = true;
|
||||
cpuTimer = 2;
|
||||
cpuTimer = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("CPU: DMG Speed\n");
|
||||
cpuCgbSpeed = false;
|
||||
cpuTimer = 4;
|
||||
cpuTimer = 3;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
1
input.c
1
input.c
@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
#include "input.h"
|
||||
|
||||
|
||||
47
main.c
47
main.c
@ -26,7 +26,7 @@
|
||||
#define DEBUG_KEY 0
|
||||
#define DEBUG_LOAD_INFO 1
|
||||
|
||||
static const char *VERSION_STRING = "fixGB Alpha v0.4";
|
||||
static const char *VERSION_STRING = "fixGB Alpha v0.4.1";
|
||||
|
||||
static void gbEmuDisplayFrame(void);
|
||||
static void gbEmuMainLoop(void);
|
||||
@ -40,7 +40,7 @@ static void gbEmuHandleSpecialUp(int key, int x, int y);
|
||||
uint8_t *emuGBROM = NULL;
|
||||
char *emuSaveName = NULL;
|
||||
//used externally
|
||||
uint32_t *textureImage = NULL;
|
||||
uint32_t textureImage[0x9A00];
|
||||
bool nesPause = false;
|
||||
bool ppuDebugPauseFrame = false;
|
||||
bool gbEmuGBSPlayback = false;
|
||||
@ -50,7 +50,7 @@ uint16_t gbsInitAddr = 0;
|
||||
uint16_t gbsPlayAddr = 0;
|
||||
uint16_t gbsSP = 0;
|
||||
uint8_t gbsTracksTotal = 0, gbsTMA = 0, gbsTAC = 0;
|
||||
uint8_t cpuTimer = 4;
|
||||
uint8_t cpuTimer = 3;
|
||||
bool allowCgbRegs = false;
|
||||
|
||||
static bool inPause = false;
|
||||
@ -197,7 +197,6 @@ int main(int argc, char** argv)
|
||||
emuMainFrameStart = GetTickCount();
|
||||
#endif
|
||||
#endif
|
||||
textureImage = malloc(visibleImg);
|
||||
memset(textureImage,0,visibleImg);
|
||||
//do one scanline per idle loop
|
||||
mainLoopRuns = 70224;
|
||||
@ -248,9 +247,6 @@ static void gbEmuDeinit(void)
|
||||
if(emuSaveName != NULL)
|
||||
free(emuSaveName);
|
||||
emuSaveName = NULL;
|
||||
if(textureImage != NULL)
|
||||
free(textureImage);
|
||||
textureImage = NULL;
|
||||
//printf("Bye!\n");
|
||||
}
|
||||
|
||||
@ -258,9 +254,8 @@ static void gbEmuDeinit(void)
|
||||
bool emuSkipVsync = false;
|
||||
bool emuSkipFrame = false;
|
||||
|
||||
static uint16_t apuClock = 1;
|
||||
static uint16_t cpuClock = 1;
|
||||
static uint16_t memClock = 1;
|
||||
static uint8_t mainClock = 0;
|
||||
static uint8_t memClock = 0;
|
||||
|
||||
static void gbEmuMainLoop(void)
|
||||
{
|
||||
@ -276,26 +271,20 @@ static void gbEmuMainLoop(void)
|
||||
return;
|
||||
}
|
||||
//run APU first to make sure its synced
|
||||
if(apuClock >= 16)
|
||||
if(!(mainClock&15) && !apuCycle())
|
||||
{
|
||||
if(!apuCycle())
|
||||
{
|
||||
#if (WINDOWS_BUILD && DEBUG_MAIN_CALLS)
|
||||
emuMainTimesSkipped++;
|
||||
#endif
|
||||
audioSleep();
|
||||
return;
|
||||
}
|
||||
apuClock = 1;
|
||||
#if (WINDOWS_BUILD && DEBUG_MAIN_CALLS)
|
||||
emuMainTimesSkipped++;
|
||||
#endif
|
||||
audioSleep();
|
||||
return;
|
||||
}
|
||||
else
|
||||
apuClock++;
|
||||
//channel timer updates
|
||||
apuClockTimers();
|
||||
//run possible DMA next
|
||||
memDmaClockTimers();
|
||||
//run CPU (and mem clocks) next
|
||||
if(cpuClock >= cpuTimer)
|
||||
if(!(mainClock&cpuTimer))
|
||||
{
|
||||
//main CPU clock
|
||||
if(!cpuCycle())
|
||||
@ -305,17 +294,10 @@ static void gbEmuMainLoop(void)
|
||||
}
|
||||
//mem clock tied to CPU clock, so
|
||||
//double speed in CGB mode!
|
||||
if(memClock >= 4)
|
||||
{
|
||||
if(!(memClock&3))
|
||||
memClockTimers();
|
||||
memClock = 1;
|
||||
}
|
||||
else
|
||||
memClock++;
|
||||
cpuClock = 1;
|
||||
memClock++;
|
||||
}
|
||||
else
|
||||
cpuClock++;
|
||||
//run PPU last
|
||||
if(!ppuCycle())
|
||||
exit(EXIT_SUCCESS);
|
||||
@ -344,6 +326,7 @@ static void gbEmuMainLoop(void)
|
||||
else if(!gbsTimerMode)
|
||||
cpuPlayGBS();
|
||||
}
|
||||
mainClock++;
|
||||
}
|
||||
while(mainLoopPos--);
|
||||
mainLoopPos = mainLoopRuns;
|
||||
|
||||
1
mem.c
1
mem.c
@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
#include "mem.h"
|
||||
#include "cpu.h"
|
||||
|
||||
8
ppu.c
8
ppu.c
@ -7,6 +7,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
#include "cpu.h"
|
||||
#include "ppu.h"
|
||||
@ -45,7 +46,7 @@ typedef void (*drawFunc)(size_t);
|
||||
static drawFunc ppuDrawDot = NULL;
|
||||
|
||||
//from main.c
|
||||
extern uint32_t *textureImage;
|
||||
extern uint32_t textureImage[0x9A00];
|
||||
extern bool allowCgbRegs;
|
||||
//used externally
|
||||
uint8_t ppuCgbBank = 0;
|
||||
@ -220,6 +221,11 @@ ppuIncreasePos:
|
||||
//printf("VBlank STAT IRQ\n");
|
||||
memEnableStatIrq();
|
||||
}
|
||||
if(PPU_Reg[1]&PPU_OAM_IRQ)
|
||||
{
|
||||
//printf("OAM STAT IRQ\n");
|
||||
memEnableStatIrq();
|
||||
}
|
||||
//printf("VBlank Start\n");
|
||||
}
|
||||
else if(PPU_Reg[4] == 154)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user