| [PATCH 03/20] Convert the C++ code constructs to plain C |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/hatari-devel Archives
]
- Subject: [PATCH 03/20] Convert the C++ code constructs to plain C
- From: Thomas Huth <huth@xxxxxxxxxxxxx>
- Date: Sun, 24 Dec 2023 14:42:31 +0100
---
src/jaguar/cdintf.c | 2 ++
src/jaguar/cdrom.c | 6 +++--
src/jaguar/cdrom.h | 10 ++++-----
src/jaguar/dac.c | 2 +-
src/jaguar/dac.h | 8 +++----
src/jaguar/dsp.c | 28 +++++++++++------------
src/jaguar/dsp.h | 13 ++++++-----
src/jaguar/event.c | 5 +++--
src/jaguar/file.c | 22 +++++++++---------
src/jaguar/file.h | 17 +++++---------
src/jaguar/filedb.c | 2 +-
src/jaguar/filedb.h | 2 +-
src/jaguar/gpu.c | 2 +-
src/jaguar/gpu.h | 12 +++++-----
src/jaguar/jagdasm.c | 2 +-
src/jaguar/jaguar.c | 52 +++++++++++++++++++++----------------------
src/jaguar/jaguar.h | 13 ++++++-----
src/jaguar/jerry.h | 10 ++++-----
src/jaguar/joystick.h | 1 +
src/jaguar/objectp.c | 2 +-
src/jaguar/objectp.h | 1 +
src/jaguar/settings.h | 8 +++----
src/jaguar/tom.c | 12 +++++-----
src/jaguar/tom.h | 9 ++++----
24 files changed, 123 insertions(+), 118 deletions(-)
diff --git a/src/jaguar/cdintf.c b/src/jaguar/cdintf.c
index 8973c454..93dd1df8 100644
--- a/src/jaguar/cdintf.c
+++ b/src/jaguar/cdintf.c
@@ -23,6 +23,8 @@
// change permanent.)
//#define HAVE_LIB_CDIO
+#include <stdbool.h>
+
#include "cdintf.h" // Every OS has to implement these
#ifdef HAVE_LIB_CDIO
diff --git a/src/jaguar/cdrom.c b/src/jaguar/cdrom.c
index c45a8f03..84a28b9d 100644
--- a/src/jaguar/cdrom.c
+++ b/src/jaguar/cdrom.c
@@ -13,9 +13,11 @@
// JLH 01/16/2010 Created this log ;-)
//
+#include <string.h> // For memset, etc.
+#include <stdbool.h>
+
#include "cdrom.h"
-#include <string.h> // For memset, etc.
//#include "jaguar.h" // For GET32/SET32 macros
#include "m68k.h"
//#include "memory.h"
@@ -657,7 +659,7 @@ void CDROMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/)
//
enum ButchState { ST_INIT, ST_RISING, ST_FALLING };
-static ButchState currentState = ST_INIT;
+static enum ButchState currentState = ST_INIT;
static uint16 counter = 0;
static bool cmdTx = false;
static uint16 busCmd;
diff --git a/src/jaguar/cdrom.h b/src/jaguar/cdrom.h
index 963a02ae..73aa8b9c 100644
--- a/src/jaguar/cdrom.h
+++ b/src/jaguar/cdrom.h
@@ -14,13 +14,13 @@ void CDROMDone(void);
void BUTCHExec(uint32 cycles);
-uint8 CDROMReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 CDROMReadWord(uint32 offset, uint32 who = UNKNOWN);
-void CDROMWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void CDROMWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
+uint8 CDROMReadByte(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint16 CDROMReadWord(uint32 offset, uint32 who /*= UNKNOWN*/);
+void CDROMWriteByte(uint32 offset, uint8 data, uint32 who /*= UNKNOWN*/);
+void CDROMWriteWord(uint32 offset, uint16 data, uint32 who /*= UNKNOWN*/);
bool ButchIsReadyToSend(void);
-uint16 GetWordFromButchSSI(uint32 offset, uint32 who = UNKNOWN);
+uint16 GetWordFromButchSSI(uint32 offset, uint32 who /*= UNKNOWN*/);
void SetSSIWordsXmittedFromButch(void);
#endif // __CDROM_H__
diff --git a/src/jaguar/dac.c b/src/jaguar/dac.c
index f37dd843..fc39339c 100644
--- a/src/jaguar/dac.c
+++ b/src/jaguar/dac.c
@@ -200,7 +200,7 @@ void DACWriteByte(uint32 offset, uint8 data, uint32 who/*= UNKNOWN*/)
{
WriteLog("DAC: %s writing BYTE %02X at %08X\n", whoName[who], data, offset);
if (offset == SCLK + 3)
- DACWriteWord(offset - 3, (uint16)data);
+ DACWriteWord(offset - 3, (uint16_t)data, UNKNOWN);
}
void DACWriteWord(uint32 offset, uint16 data, uint32 who/*= UNKNOWN*/)
diff --git a/src/jaguar/dac.h b/src/jaguar/dac.h
index ac94d06f..660a09eb 100644
--- a/src/jaguar/dac.h
+++ b/src/jaguar/dac.h
@@ -14,10 +14,10 @@ void DACDone(void);
// DAC memory access
-void DACWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void DACWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
-uint8 DACReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 DACReadWord(uint32 offset, uint32 who = UNKNOWN);
+void DACWriteByte(uint32 offset, uint8 data, uint32 who /*= UNKNOWN*/);
+void DACWriteWord(uint32 offset, uint16 data, uint32 who /*= UNKNOWN*/);
+uint8 DACReadByte(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint16 DACReadWord(uint32 offset, uint32 who /*= UNKNOWN*/);
// Global variables
diff --git a/src/jaguar/dsp.c b/src/jaguar/dsp.c
index 39905453..99b8cf29 100644
--- a/src/jaguar/dsp.c
+++ b/src/jaguar/dsp.c
@@ -180,7 +180,7 @@ bool scoreboard[32];
uint8 scoreboard[32];
#endif
uint8 plPtrFetch, plPtrRead, plPtrExec, plPtrWrite;
-PipelineStage pipeline[4];
+struct PipelineStage pipeline[4];
bool IMASKCleared = false;
// DSP flags (old--have to get rid of this crap)
@@ -1036,11 +1036,11 @@ WriteLog("\tW -> %02u, %02u, %02u; r1=%08X, r2= %08X, res=%08X, wb=%u (%s)\n", p
else
{
if (pipeline[plPtrWrite].type == TYPE_BYTE)
- JaguarWriteByte(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteByte(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
else if (pipeline[plPtrWrite].type == TYPE_WORD)
- JaguarWriteWord(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteWord(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
else
- JaguarWriteLong(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteLong(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
}
}
@@ -2112,7 +2112,7 @@ static void dsp_opcode_movei(void)
{
#ifdef DSP_DIS_MOVEI
if (doDSPDis)
- WriteLog("%06X: MOVEI #$%08X, R%02u [NCZ:%u%u%u, R%02u=%08X] -> ", dsp_pc-2, (uint32)DSPReadWord(dsp_pc) | ((uint32)DSPReadWord(dsp_pc + 2) << 16), IMM_2, dsp_flag_n, dsp_flag_c, dsp_flag_z, IMM_2, RN);
+ WriteLog("%06X: MOVEI #$%08X, R%02u [NCZ:%u%u%u, R%02u=%08X] -> ", dsp_pc-2, (uint32)DSPReadWord(dsp_pc, UNKNOWN) | ((uint32)DSPReadWord(dsp_pc + 2, UNKNOWN)) << 16, IMM_2, dsp_flag_n, dsp_flag_c, dsp_flag_z, IMM_2, RN);
#endif
// This instruction is followed by 32-bit value in LSW / MSW format...
RN = (uint32)DSPReadWord(dsp_pc, DSP) | ((uint32)DSPReadWord(dsp_pc + 2, DSP) << 16);
@@ -3270,11 +3270,11 @@ WriteLog("\n");
else
{
if (pipeline[plPtrWrite].type == TYPE_BYTE)
- JaguarWriteByte(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteByte(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
else if (pipeline[plPtrWrite].type == TYPE_WORD)
- JaguarWriteWord(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteWord(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
else
- JaguarWriteLong(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteLong(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
}
}
@@ -3748,11 +3748,11 @@ const char * condition[32] =
else
{
if (pipeline[plPtrWrite].type == TYPE_BYTE)
- JaguarWriteByte(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteByte(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
else if (pipeline[plPtrWrite].type == TYPE_WORD)
- JaguarWriteWord(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteWord(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
else
- JaguarWriteLong(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteLong(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
}
}
@@ -3853,11 +3853,11 @@ const char * condition[32] =
else
{
if (pipeline[plPtrWrite].type == TYPE_BYTE)
- JaguarWriteByte(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteByte(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
else if (pipeline[plPtrWrite].type == TYPE_WORD)
- JaguarWriteWord(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteWord(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
else
- JaguarWriteLong(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value);
+ JaguarWriteLong(pipeline[plPtrWrite].address, pipeline[plPtrWrite].value, UNKNOWN);
}
}
diff --git a/src/jaguar/dsp.h b/src/jaguar/dsp.h
index 44e8b707..3c160fe6 100644
--- a/src/jaguar/dsp.h
+++ b/src/jaguar/dsp.h
@@ -5,6 +5,7 @@
#ifndef __DSP_H__
#define __DSP_H__
+#include <stdbool.h>
//#include "types.h"
#include "memory.h"
@@ -18,12 +19,12 @@ void DSPDone(void);
void DSPUpdateRegisterBanks(void);
void DSPHandleIRQs(void);
void DSPSetIRQLine(int irqline, int state);
-uint8 DSPReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 DSPReadWord(uint32 offset, uint32 who = UNKNOWN);
-uint32 DSPReadLong(uint32 offset, uint32 who = UNKNOWN);
-void DSPWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void DSPWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
-void DSPWriteLong(uint32 offset, uint32 data, uint32 who = UNKNOWN);
+uint8 DSPReadByte(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint16 DSPReadWord(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint32 DSPReadLong(uint32 offset, uint32 who /*= UNKNOWN*/);
+void DSPWriteByte(uint32 offset, uint8 data, uint32 who /*= UNKNOWN*/);
+void DSPWriteWord(uint32 offset, uint16 data, uint32 who /*= UNKNOWN*/);
+void DSPWriteLong(uint32 offset, uint32 data, uint32 who /*= UNKNOWN*/);
void DSPReleaseTimeslice(void);
void DSPExecP(int32 cycles);
diff --git a/src/jaguar/event.c b/src/jaguar/event.c
index 2fbfa33c..aeb805bc 100644
--- a/src/jaguar/event.c
+++ b/src/jaguar/event.c
@@ -17,8 +17,9 @@
// - Handling for an event that occurs NOW
//
-#include "event.h"
+#include <stdbool.h>
+#include "event.h"
#include "log.h"
#define EVENT_LIST_SIZE 512
@@ -85,7 +86,7 @@ struct Event
void (* timerCallback)(void);
};
-Event eventList[EVENT_LIST_SIZE];
+struct Event eventList[EVENT_LIST_SIZE];
uint32 nextEvent;
void InitializeEventList(void)
diff --git a/src/jaguar/file.c b/src/jaguar/file.c
index 854507a5..def7634d 100644
--- a/src/jaguar/file.c
+++ b/src/jaguar/file.c
@@ -68,7 +68,7 @@ uint32 JaguarLoadROM(uint8 * rom, char * path)
WriteLog("(ZIPped)...");
uint8_t * buffer = NULL;
- romSize = GetFileFromZIP(path, FT_SOFTWARE, buffer);
+ romSize = GetFileFromZIP(path, FT_SOFTWARE, &buffer);
if (romSize == 0)
{
@@ -77,7 +77,7 @@ uint32 JaguarLoadROM(uint8 * rom, char * path)
}
memcpy(rom, buffer, romSize);
- delete[] buffer;
+ free(buffer);
}
else
{
@@ -452,11 +452,15 @@ static bool CheckExtension(const char * filename, const char * ext)
// NOTE: If the thing we're looking for is found, it allocates it in the passed in buffer.
// Which means we have to deallocate it later.
//
-uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer)
+uint32 GetFileFromZIP(const char * zipFile, enum FileType type, uint8_t **buffer)
{
+ bool found = false;
+ uint32 fileSize = 0;
+
// NOTE: We could easily check for this by discarding anything that's larger than the RAM/ROM
// size of the Jaguar console.
#warning "!!! FIX !!! Should have sanity checking for ROM size to prevent buffer overflow!"
+#if 0 // TODO - reimplement this
const char ftStrings[5][32] = { "Software", "EEPROM", "Label", "Box Art", "Controller Overlay" };
ZIP * zip = openzip(0, 0, zipFile);
@@ -467,7 +471,6 @@ uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer)
}
zipent * ze;
- bool found = false;
// The order is here is important: If the file is found, we need to short-circuit the
// readzip() call because otherwise, 'ze' will be pointing to the wrong file!
@@ -498,23 +501,21 @@ uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer)
}
}
- uint32 fileSize = 0;
-
if (found)
{
WriteLog("FILE: Uncompressing...");
// Insert file size sanity check here...
- buffer = new uint8[ze->uncompressed_size];
+ *buffer = malloc(ze->uncompressed_size);
- if (readuncompresszip(zip, ze, (char *)buffer) == 0)
+ if (readuncompresszip(zip, ze, (char *)*buffer) == 0)
{
fileSize = ze->uncompressed_size;
WriteLog("success! (%u bytes)\n", fileSize);
}
else
{
- delete[] buffer;
- buffer = NULL;
+ free(*buffer);
+ *buffer = NULL;
WriteLog("FAILED!\n");
}
}
@@ -523,6 +524,7 @@ uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer)
WriteLog("FILE: Failed to find file of type %s...\n", ftStrings[type]);
closezip(zip);
+#endif
return fileSize;
}
diff --git a/src/jaguar/file.h b/src/jaguar/file.h
index 45d2dd3e..4887f334 100644
--- a/src/jaguar/file.h
+++ b/src/jaguar/file.h
@@ -4,23 +4,16 @@
// File support
//
-#ifndef __FILE_H__
-#define __FILE_H__
+#ifndef JAG_FILE_H
+#define JAG_FILE_H
+#include <stdbool.h>
#include "types.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
enum FileType { FT_SOFTWARE=0, FT_EEPROM, FT_LABEL, FT_BOXART, FT_OVERLAY };
uint32 JaguarLoadROM(uint8 * rom, char * path);
bool JaguarLoadFile(char * path);
-uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer);
-
-#ifdef __cplusplus
-}
-#endif
+uint32 GetFileFromZIP(const char * zipFile, enum FileType type, uint8_t **buffer);
-#endif // __FILE_H__
+#endif // JAG_FILE_H
diff --git a/src/jaguar/filedb.c b/src/jaguar/filedb.c
index 3f3918ec..db30286d 100644
--- a/src/jaguar/filedb.c
+++ b/src/jaguar/filedb.c
@@ -30,7 +30,7 @@ enum FileFlags { FF_ROM=1, FF_ALPINE=2, FF_BIOS=4, FF_REQ_DSP=8, FF_REQ_BIOS=16,
// whether it's a .rom, it's a BIOS, etc...
// ... And now we do! :-D
-RomIdentifier romList[] = {
+struct RomIdentifier romList[] = {
{ 0x0509C85E, "Raiden (World)", "raiden.jpg", FF_ROM },
{ 0x08F15576, "Iron Soldier (World) (v1.04)", "iron-soldier.jpg", FF_ROM },
{ 0x0957A072, "Kasumi Ninja (World)", "kasumi-ninja.jpg", FF_ROM },
diff --git a/src/jaguar/filedb.h b/src/jaguar/filedb.h
index 685f31ff..b5357de8 100644
--- a/src/jaguar/filedb.h
+++ b/src/jaguar/filedb.h
@@ -23,6 +23,6 @@ struct RomIdentifier
// So other stuff can pull this in...
-extern RomIdentifier romList[];
+extern struct RomIdentifier romList[];
#endif // __FILEDB_H__
diff --git a/src/jaguar/gpu.c b/src/jaguar/gpu.c
index b8011a03..8bb7fb24 100644
--- a/src/jaguar/gpu.c
+++ b/src/jaguar/gpu.c
@@ -1929,7 +1929,7 @@ static void gpu_opcode_movei(void)
{
#ifdef GPU_DIS_MOVEI
if (doGPUDis)
- WriteLog("%06X: MOVEI #$%08X, R%02u [NCZ:%u%u%u, R%02u=%08X] -> ", gpu_pc-2, (uint32)GPUReadWord(gpu_pc) | ((uint32)GPUReadWord(gpu_pc + 2) << 16), IMM_2, gpu_flag_n, gpu_flag_c, gpu_flag_z, IMM_2, RN);
+ WriteLog("%06X: MOVEI #$%08X, R%02u [NCZ:%u%u%u, R%02u=%08X] -> ", gpu_pc-2, (uint32)GPUReadWord(gpu_pc, UNKNOWN) | ((uint32)GPUReadWord(gpu_pc + 2, UNKNOWN) << 16), IMM_2, gpu_flag_n, gpu_flag_c, gpu_flag_z, IMM_2, RN);
#endif
// This instruction is followed by 32-bit value in LSW / MSW format...
RN = (uint32)GPUReadWord(gpu_pc, GPU) | ((uint32)GPUReadWord(gpu_pc + 2, GPU) << 16);
diff --git a/src/jaguar/gpu.h b/src/jaguar/gpu.h
index 97ba4b33..eaccf5e3 100644
--- a/src/jaguar/gpu.h
+++ b/src/jaguar/gpu.h
@@ -19,12 +19,12 @@ void GPUUpdateRegisterBanks(void);
void GPUHandleIRQs(void);
void GPUSetIRQLine(int irqline, int state);
-uint8 GPUReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 GPUReadWord(uint32 offset, uint32 who = UNKNOWN);
-uint32 GPUReadLong(uint32 offset, uint32 who = UNKNOWN);
-void GPUWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void GPUWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
-void GPUWriteLong(uint32 offset, uint32 data, uint32 who = UNKNOWN);
+uint8 GPUReadByte(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint16 GPUReadWord(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint32 GPUReadLong(uint32 offset, uint32 who /*= UNKNOWN*/);
+void GPUWriteByte(uint32 offset, uint8 data, uint32 who /*= UNKNOWN*/);
+void GPUWriteWord(uint32 offset, uint16 data, uint32 who /*= UNKNOWN*/);
+void GPUWriteLong(uint32 offset, uint32 data, uint32 who /*= UNKNOWN*/);
uint32 GPUGetPC(void);
void GPUReleaseTimeslice(void);
diff --git a/src/jaguar/jagdasm.c b/src/jaguar/jagdasm.c
index 6fadae8a..8b1246c0 100644
--- a/src/jaguar/jagdasm.c
+++ b/src/jaguar/jagdasm.c
@@ -3,7 +3,7 @@
#include <stdio.h>
#include "jaguar.h"
-#define ROPCODE(a) JaguarReadWord(a)
+#define ROPCODE(a) JaguarReadWord(a, UNKNOWN)
uint8 convert_zero[32] =
{ 32,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31 };
diff --git a/src/jaguar/jaguar.c b/src/jaguar/jaguar.c
index 796d9ee8..957bb80c 100644
--- a/src/jaguar/jaguar.c
+++ b/src/jaguar/jaguar.c
@@ -25,13 +25,10 @@
#include "eeprom.h"
#include "event.h"
#include "gpu.h"
-//#include "gui.h"
#include "jerry.h"
#include "joystick.h"
#include "log.h"
#include "m68k.h"
-//#include "memory.h"
-#include "mmu.h"
#include "settings.h"
#include "tom.h"
#include "video.h"
@@ -46,12 +43,14 @@
// Private function prototypes
-unsigned jaguar_unknown_readbyte(unsigned address, uint32 who = UNKNOWN);
-unsigned jaguar_unknown_readword(unsigned address, uint32 who = UNKNOWN);
-void jaguar_unknown_writebyte(unsigned address, unsigned data, uint32 who = UNKNOWN);
-void jaguar_unknown_writeword(unsigned address, unsigned data, uint32 who = UNKNOWN);
+unsigned jaguar_unknown_readbyte(unsigned address, uint32 who /*= UNKNOWN*/);
+unsigned jaguar_unknown_readword(unsigned address, uint32 who /*= UNKNOWN*/);
+void jaguar_unknown_writebyte(unsigned address, unsigned data, uint32 who /*= UNKNOWN*/);
+void jaguar_unknown_writeword(unsigned address, unsigned data, uint32 who /*= UNKNOWN*/);
void M68K_show_context(void);
+unsigned int m68k_read_memory_16(unsigned int address);
+
// External variables
#ifdef CPU_DEBUG_MEMORY
@@ -105,9 +104,9 @@ void M68KInstructionHook(void)
WriteLog("\n");
uint32 topOfStack = m68k_get_reg(NULL, M68K_REG_A7);
- WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack));
+ WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack, UNKNOWN));
for(int i=0; i<10; i++)
- WriteLog("%06X: %08X\n", topOfStack - (i * 4), JaguarReadLong(topOfStack - (i * 4)));
+ WriteLog("%06X: %08X\n", topOfStack - (i * 4), JaguarReadLong(topOfStack - (i * 4), UNKNOWN));
WriteLog("Jaguar: VBL interrupt is %s\n", ((TOMIRQEnabled(IRQ_VBLANK)) && (JaguarInterruptHandlerIsValid(64))) ? "enabled" : "disabled");
M68K_show_context();
LogDone();
@@ -329,9 +328,9 @@ CD_switch:: -> $306C
WriteLog("\nM68K encountered an illegal instruction at %08X!!!\n\nAborting!\n", m68kPC);
uint32 topOfStack = m68k_get_reg(NULL, M68K_REG_A7);
- WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack));
+ WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack, UNKNOWN));
for(int i=0; i<10; i++)
- WriteLog("%06X: %08X\n", topOfStack - (i * 4), JaguarReadLong(topOfStack - (i * 4)));
+ WriteLog("%06X: %08X\n", topOfStack - (i * 4), JaguarReadLong(topOfStack - (i * 4), UNKNOWN));
WriteLog("Jaguar: VBL interrupt is %s\n", ((TOMIRQEnabled(IRQ_VBLANK)) && (JaguarInterruptHandlerIsValid(64))) ? "enabled" : "disabled");
M68K_show_context();
@@ -775,7 +774,7 @@ uint32 ReadDWord(uint32 adddress)
//
// Musashi 68000 read/write/IRQ functions
//
-
+#ifdef USE_MUSASHI
int irq_ack_handler(int level)
{
int vector = M68K_INT_ACK_AUTOVECTOR;
@@ -790,6 +789,7 @@ int irq_ack_handler(int level)
return vector;
}
+#endif
//#define USE_NEW_MMU
@@ -818,7 +818,7 @@ unsigned int m68k_read_memory_8(unsigned int address)
else if ((address >= 0xE00000) && (address <= 0xE3FFFF))
retVal = jaguarBootROM[address - 0xE00000];
else if ((address >= 0xDFFF00) && (address <= 0xDFFFFF))
- retVal = CDROMReadByte(address);
+ retVal = CDROMReadByte(address, M68K);
else if ((address >= 0xF00000) && (address <= 0xF0FFFF))
retVal = TOMReadByte(address, M68K);
else if ((address >= 0xF10000) && (address <= 0xF1FFFF))
@@ -1084,7 +1084,7 @@ if (address == 0xF03214 && value == 0x88E30047)
uint32 JaguarGetHandler(uint32 i)
{
- return JaguarReadLong(i * 4);
+ return JaguarReadLong(i * 4, UNKNOWN);
}
bool JaguarInterruptHandlerIsValid(uint32 i) // Debug use only...
@@ -1575,9 +1575,9 @@ void JaguarDone(void)
// for(int i=M68K_REG_A0; i<=M68K_REG_A7; i++)
// WriteLog("\tA%i = 0x%.8x\n", i-M68K_REG_A0, m68k_get_reg(NULL, (m68k_register_t)i));
int32 topOfStack = m68k_get_reg(NULL, M68K_REG_A7);
- WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack));
+ WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack, UNKNOWN));
for(int i=-2; i<9; i++)
- WriteLog("%06X: %08X\n", topOfStack + (i * 4), JaguarReadLong(topOfStack + (i * 4)));
+ WriteLog("%06X: %08X\n", topOfStack + (i * 4), JaguarReadLong(topOfStack + (i * 4), UNKNOWN));
/* WriteLog("\nM68000 disassembly at $802288...\n");
jaguar_dasm(0x802288, 3);
@@ -1609,7 +1609,7 @@ void JaguarDone(void)
WriteLog("\n");//*/
// WriteLog("Jaguar: CD BIOS version %04X\n", JaguarReadWord(0x3004));
- WriteLog("Jaguar: Interrupt enable = %02X\n", TOMReadByte(0xF000E1) & 0x1F);
+ WriteLog("Jaguar: Interrupt enable = %02X\n", TOMReadByte(0xF000E1, UNKNOWN) & 0x1F);
WriteLog("Jaguar: VBL interrupt is %s\n", ((TOMIRQEnabled(IRQ_VBLANK)) && (JaguarInterruptHandlerIsValid(64))) ? "enabled" : "disabled");
M68K_show_context();
//#endif
@@ -1626,8 +1626,8 @@ void JaguarDone(void)
//
void JaguarExecute(uint32 * backbuffer, bool render)
{
- uint16 vp = TOMReadWord(0xF0003E) + 1;
- uint16 vi = TOMReadWord(0xF0004E);
+ uint16_t vp = TOMReadWord(0xF0003E, UNKNOWN) + 1;
+ uint16_t vi = TOMReadWord(0xF0004E, UNKNOWN);
//Using WO registers is OK, since we're the ones controlling access--there's nothing wrong here! ;-)
//Though we shouldn't be able to do it using TOMReadWord... !!! FIX !!!
@@ -1657,9 +1657,9 @@ if (effect_start)
for(uint16 i=0; i<vp; i++)
{
// Increment the horizontal count (why? RNG? Besides which, this is *NOT* cycle accurate!)
- TOMWriteWord(0xF00004, (TOMReadWord(0xF00004) + 1) & 0x7FF);
+ TOMWriteWord(0xF00004, (TOMReadWord(0xF00004, UNKNOWN) + 1) & 0x7FF, UNKNOWN);
- TOMWriteWord(0xF00006, i); // Write the VC
+ TOMWriteWord(0xF00006, i, UNKNOWN); // Write the VC
// if (i == vi) // Time for Vertical Interrupt?
//Not sure if this is correct...
@@ -1861,17 +1861,17 @@ void JaguarExecuteNew(void)
void ScanlineCallback(void)
{
- uint16 vc = TOMReadWord(0xF00006);
- uint16 vp = TOMReadWord(0xF0003E) + 1;
- uint16 vi = TOMReadWord(0xF0004E);
-// uint16 vbb = TOMReadWord(0xF00040);
+ uint16_t vc = TOMReadWord(0xF00006, UNKNOWN);
+ uint16_t vp = TOMReadWord(0xF0003E, UNKNOWN) + 1;
+ uint16_t vi = TOMReadWord(0xF0004E, UNKNOWN);
+// uint16_t vbb = TOMReadWord(0xF00040, UNKNOWN);
vc++;
if (vc >= vp)
vc = 0;
//WriteLog("SLC: Currently on line %u (VP=%u)...\n", vc, vp);
- TOMWriteWord(0xF00006, vc);
+ TOMWriteWord(0xF00006, vc, UNKNOWN);
//This is a crappy kludge, but maybe it'll work for now...
//Maybe it's not so bad, since the IRQ happens on a scanline boundary...
diff --git a/src/jaguar/jaguar.h b/src/jaguar/jaguar.h
index d83cd6ae..dfa1988f 100644
--- a/src/jaguar/jaguar.h
+++ b/src/jaguar/jaguar.h
@@ -1,6 +1,7 @@
#ifndef __JAGUAR_H__
#define __JAGUAR_H__
+#include <stdbool.h>
#include "types.h"
#include "memory.h" // For "UNKNOWN" enum
@@ -8,12 +9,12 @@ void JaguarInit(void);
void JaguarReset(void);
void JaguarDone(void);
-uint8 JaguarReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 JaguarReadWord(uint32 offset, uint32 who = UNKNOWN);
-uint32 JaguarReadLong(uint32 offset, uint32 who = UNKNOWN);
-void JaguarWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void JaguarWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
-void JaguarWriteLong(uint32 offset, uint32 data, uint32 who = UNKNOWN);
+uint8 JaguarReadByte(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint16 JaguarReadWord(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint32 JaguarReadLong(uint32 offset, uint32 who /*= UNKNOWN*/);
+void JaguarWriteByte(uint32 offset, uint8 data, uint32 who /*= UNKNOWN*/);
+void JaguarWriteWord(uint32 offset, uint16 data, uint32 who /*= UNKNOWN*/);
+void JaguarWriteLong(uint32 offset, uint32 data, uint32 who /*= UNKNOWN*/);
bool JaguarInterruptHandlerIsValid(uint32 i);
void JaguarDasm(uint32 offset, uint32 qt);
diff --git a/src/jaguar/jerry.h b/src/jaguar/jerry.h
index fd008d93..0f1c1284 100644
--- a/src/jaguar/jerry.h
+++ b/src/jaguar/jerry.h
@@ -5,17 +5,17 @@
#ifndef __JERRY_H__
#define __JERRY_H__
-//#include "types.h"
+#include <stdbool.h>
#include "memory.h"
void JERRYInit(void);
void JERRYReset(void);
void JERRYDone(void);
-uint8 JERRYReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 JERRYReadWord(uint32 offset, uint32 who = UNKNOWN);
-void JERRYWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void JERRYWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
+uint8 JERRYReadByte(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint16 JERRYReadWord(uint32 offset, uint32 who /*= UNKNOWN*/);
+void JERRYWriteByte(uint32 offset, uint8 data, uint32 who /*= UNKNOWN*/);
+void JERRYWriteWord(uint32 offset, uint16 data, uint32 who /*= UNKNOWN*/);
void JERRYExecPIT(uint32 cycles);
void JERRYI2SExec(uint32 cycles);
diff --git a/src/jaguar/joystick.h b/src/jaguar/joystick.h
index 98eb9775..9a1bfebe 100644
--- a/src/jaguar/joystick.h
+++ b/src/jaguar/joystick.h
@@ -5,6 +5,7 @@
#ifndef __JOYSTICK_H__
#define __JOYSTICK_H__
+#include <stdbool.h>
#include "types.h"
enum { BUTTON_FIRST = 0, BUTTON_U = 0,
diff --git a/src/jaguar/objectp.c b/src/jaguar/objectp.c
index 555268e4..d6a5c724 100644
--- a/src/jaguar/objectp.c
+++ b/src/jaguar/objectp.c
@@ -1314,7 +1314,7 @@ if (op_start_log && startPos == 13)
{
WriteLog(" %08X: ", data);
for(int i=0; i<7*8; i++)
- WriteLog("%02X ", JaguarReadByte(data+i));
+ WriteLog("%02X ", JaguarReadByte(data+i, UNKNOWN));
WriteLog("\n");
}
}
diff --git a/src/jaguar/objectp.h b/src/jaguar/objectp.h
index 20e71902..fe331e9b 100644
--- a/src/jaguar/objectp.h
+++ b/src/jaguar/objectp.h
@@ -5,6 +5,7 @@
#ifndef __OBJECTP_H__
#define __OBJECTP_H__
+#include <stdbool.h>
#include "types.h"
void OPInit(void);
diff --git a/src/jaguar/settings.h b/src/jaguar/settings.h
index a7ca244e..857d3f72 100644
--- a/src/jaguar/settings.h
+++ b/src/jaguar/settings.h
@@ -5,12 +5,12 @@
#ifndef __SETTINGS_H__
#define __SETTINGS_H__
+#include <stdbool.h>
+#include <stdlib.h> // for MAX_PATH on MinGW/Darwin
// MAX_PATH isn't defined in stdlib.h on *nix, so we do it here...
-#ifdef __GCCUNIX__
+#ifndef MAX_PATH
#include <limits.h>
#define MAX_PATH _POSIX_PATH_MAX
-#else
-#include <stdlib.h> // for MAX_PATH on MinGW/Darwin
#endif
#include "types.h"
@@ -55,6 +55,6 @@ void SaveVJSettings(void);
// Exported variables
-extern VJSettings vjs;
+extern struct VJSettings vjs;
#endif // __SETTINGS_H__
diff --git a/src/jaguar/tom.c b/src/jaguar/tom.c
index 4b109b46..6f4fe1e3 100644
--- a/src/jaguar/tom.c
+++ b/src/jaguar/tom.c
@@ -1229,12 +1229,12 @@ void TOMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/)
#ifdef TOM_DEBUG
WriteLog("TOM: Writing word %04X at %06X\n", data, offset);
#endif
-if (offset == 0xF00000 + MEMCON1)
- WriteLog("TOM: Memory Configuration 1 written by %s: %04X\n", whoName[who], data);
-if (offset == 0xF00000 + MEMCON2)
- WriteLog("TOM: Memory Configuration 2 written by %s: %04X\n", whoName[who], data);
-if (offset >= 0xF02000 && offset <= 0xF020FF)
- WriteLog("TOM: Write attempted to GPU register file by %s (unimplemented)!\n", whoName[who]);
+ if (offset == 0xF00000 + MEMCON1)
+ WriteLog("TOM: Memory Configuration 1 written by %s: %04X\n", whoName[who], data);
+ if (offset == 0xF00000 + MEMCON2)
+ WriteLog("TOM: Memory Configuration 2 written by %s: %04X\n", whoName[who], data);
+ if (offset >= 0xF02000 && offset <= 0xF020FF)
+ WriteLog("TOM: Write attempted to GPU register file by %s (unimplemented)!\n", whoName[who]);
if ((offset >= GPU_CONTROL_RAM_BASE) && (offset < GPU_CONTROL_RAM_BASE+0x20))
{
diff --git a/src/jaguar/tom.h b/src/jaguar/tom.h
index a484d787..84fa852e 100644
--- a/src/jaguar/tom.h
+++ b/src/jaguar/tom.h
@@ -5,6 +5,7 @@
#ifndef __TOM_H__
#define __TOM_H__
+#include <stdbool.h>
//#include "jaguar.h"
//#include "types.h"
#include "memory.h"
@@ -22,10 +23,10 @@ void TOMInit(void);
void TOMReset(void);
void TOMDone(void);
-uint8 TOMReadByte(uint32 offset, uint32 who = UNKNOWN);
-uint16 TOMReadWord(uint32 offset, uint32 who = UNKNOWN);
-void TOMWriteByte(uint32 offset, uint8 data, uint32 who = UNKNOWN);
-void TOMWriteWord(uint32 offset, uint16 data, uint32 who = UNKNOWN);
+uint8 TOMReadByte(uint32 offset, uint32 who /*= UNKNOWN*/);
+uint16 TOMReadWord(uint32 offset, uint32 who /*= UNKNOWN*/);
+void TOMWriteByte(uint32 offset, uint8 data, uint32 who /*= UNKNOWN*/);
+void TOMWriteWord(uint32 offset, uint16 data, uint32 who /*= UNKNOWN*/);
//void TOMExecScanline(int16 * backbuffer, int32 scanline, bool render);
void TOMExecScanline(uint16 scanline, bool render);
--
2.48.1
--MP_/VkVZp1l8MIESxWVe2vPSxV2
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename=0004-Export-Screen_SetSDLVideoSize.patch