/* sim65 */
#include "cfgdata.h"
#include "chipdata.h"
+#include "cpucore.h"
#include "error.h"
#include "chip.h"
+/*****************************************************************************/
+/* Forwards */
+/*****************************************************************************/
+
+
+
+static int GetCfgId (void* CfgInfo, const char* Name, char** Id);
+/* Search CfgInfo for an attribute with the given name and type "id". If
+ * found, remove it from the configuration, pass a pointer to a dynamically
+ * allocated string containing the value to Id, and return true. If not
+ * found, return false. The memory passed in Id must be free by a call to
+ * Free();
+ */
+
+static int GetCfgStr (void* CfgInfo, const char* Name, char** S);
+/* Search CfgInfo for an attribute with the given name and type "id". If
+ * found, remove it from the configuration, pass a pointer to a dynamically
+ * allocated string containing the value to Id, and return true. If not
+ * found, return false. The memory passed in S must be free by a call to
+ * Free();
+ */
+
+static int GetCfgNum (void* CfgInfo, const char* Name, long* Val);
+/* Search CfgInfo for an attribute with the given name and type "number".
+ * If found, remove it from the configuration, copy it into Val and return
+ * true. If not found, return false.
+ */
+
+
+
/*****************************************************************************/
/* Data */
/*****************************************************************************/
Warning,
Error,
Internal,
- CfgDataGetId,
- CfgDataGetStr,
- CfgDataGetNum
+ Break,
+ GetCfgId,
+ GetCfgStr,
+ GetCfgNum
};
+static int GetCfgId (void* CfgInfo, const char* Name, char** Id)
+/* Search CfgInfo for an attribute with the given name and type "id". If
+ * found, remove it from the configuration, pass a pointer to a dynamically
+ * allocated string containing the value to Id, and return true. If not
+ * found, return false. The memory passed in Id must be free by a call to
+ * Free();
+ */
+{
+ return CfgDataGetId (CfgInfo, Name, Id);
+}
+
+
+
+static int GetCfgStr (void* CfgInfo, const char* Name, char** S)
+/* Search CfgInfo for an attribute with the given name and type "id". If
+ * found, remove it from the configuration, pass a pointer to a dynamically
+ * allocated string containing the value to Id, and return true. If not
+ * found, return false. The memory passed in S must be free by a call to
+ * Free();
+ */
+{
+ return CfgDataGetStr (CfgInfo, Name, S);
+}
+
+
+
+static int GetCfgNum (void* CfgInfo, const char* Name, long* Val)
+/* Search CfgInfo for an attribute with the given name and type "number".
+ * If found, remove it from the configuration, copy it into Val and return
+ * true. If not found, return false.
+ */
+{
+ return CfgDataGetNum (CfgInfo, Name, Val);
+}
+
+
+
static int CmpChips (void* Data attribute ((unused)),
const void* lhs, const void* rhs)
/* Compare function for CollSort */
const ChipData* D = Data + I;
/* Check if the chip data has the correct version */
- if (Data->MajorVersion != CHIPDATA_VER_MAJOR) {
+ if (D->MajorVersion != CHIPDATA_VER_MAJOR) {
Warning ("Version mismatch for `%s' (%s), expected %u, got %u",
D->ChipName, L->LibName,
CHIPDATA_VER_MAJOR, D->MajorVersion);
continue;
}
+ /* Initialize the chip passing the simulator data */
+ D->InitChip (&Sim65Data);
+
/* Generate a new chip */
C = NewChip (L, D);
/* Output chip name and version to keep the user happy */
Print (stdout, 1,
- " Found `%s', version %u.%u in library `%s'\n",
- Data->ChipName,
- Data->MajorVersion,
- Data->MinorVersion,
+ " Found %s `%s', version %u.%u in library `%s'\n",
+ (D->Type == CHIPDATA_TYPE_CHIP)? "chip" : "cpu",
+ D->ChipName,
+ D->MajorVersion,
+ D->MinorVersion,
L->LibName);
}
}
-/* Version information. */
+/* Chip type and version information. */
+#define CHIPDATA_TYPE_CHIP 0U
+#define CHIPDATA_TYPE_CPU 1U
#define CHIPDATA_VER_MAJOR 1U
#define CHIPDATA_VER_MINOR 0U
typedef struct ChipData ChipData;
struct ChipData {
const char* ChipName; /* Name of the chip */
+ unsigned Type; /* Type of the chip */
unsigned MajorVersion; /* Version information */
unsigned MinorVersion;
LIBS = $(COMMON)/common.a
CHIPS = ram.so \
+ rom.so \
stdio.so
OBJS = $(CHIPS:.so=.o)
$(CC) $(CFLAGS) -shared -o $@ $(LIBS) $^
@if [ $(OS2_SHELL) ] ; then $(EBIND) $@ ; fi
+rom.so: rom.o
+ $(CC) $(CFLAGS) -shared -o $@ $(LIBS) $^
+ @if [ $(OS2_SHELL) ] ; then $(EBIND) $@ ; fi
+
stdio.so: stdio.o
$(CC) $(CFLAGS) -shared -o $@ $(LIBS) $^
@if [ $(OS2_SHELL) ] ; then $(EBIND) $@ ; fi
/* */
/* */
/* */
-/* (C) 2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* (C) 2002-2003 Ullrich von Bassewitz */
+/* Römerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
-int InitChip (const struct SimData* Data);
+static int InitChip (const struct SimData* Data);
/* Initialize the chip, return an error code */
static void* InitInstance (unsigned Addr, unsigned Range, void* CfgInfo);
static const struct ChipData RAMData[1] = {
{
"RAM", /* Name of the chip */
+ CHIPDATA_TYPE_CHIP, /* Type of the chip */
CHIPDATA_VER_MAJOR, /* Version information */
CHIPDATA_VER_MINOR,
-int InitChip (const struct SimData* Data)
+static int InitChip (const struct SimData* Data)
/* Initialize the chip, return an error code */
{
/* Remember the pointer */
/* Check for a write to a write protected cell */
if (D->MemAttr[Offs] & ATTR_WPROT) {
- Sim->Warning ("Writing to write protected memory at $%04X", D->BaseAddr+Offs);
+ Sim->Break ("Writing to write protected memory at $%04X", D->BaseAddr+Offs);
}
/* Do the write and remember the cell as initialized */
/* Check for a read from an uninitialized cell */
if ((D->MemAttr[Offs] & ATTR_INITIALIZED) == 0) {
/* We're reading a memory cell that was never written to */
- Sim->Warning ("Reading from uninitialized memory at $%04X", D->BaseAddr+Offs);
+ Sim->Break ("Reading from uninitialized memory at $%04X", D->BaseAddr+Offs);
}
/* Read the cell and return the value */
--- /dev/null
+/*****************************************************************************/
+/* */
+/* rom.c */
+/* */
+/* ROM plugin for the sim65 6502 simulator */
+/* */
+/* */
+/* */
+/* (C) 2003 Ullrich von Bassewitz */
+/* Römerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
+/* */
+/* */
+/* This software is provided 'as-is', without any expressed or implied */
+/* warranty. In no event will the authors be held liable for any damages */
+/* arising from the use of this software. */
+/* */
+/* Permission is granted to anyone to use this software for any purpose, */
+/* including commercial applications, and to alter it and redistribute it */
+/* freely, subject to the following restrictions: */
+/* */
+/* 1. The origin of this software must not be misrepresented; you must not */
+/* claim that you wrote the original software. If you use this software */
+/* in a product, an acknowledgment in the product documentation would be */
+/* appreciated but is not required. */
+/* 2. Altered source versions must be plainly marked as such, and must not */
+/* be misrepresented as being the original software. */
+/* 3. This notice may not be removed or altered from any source */
+/* distribution. */
+/* */
+/*****************************************************************************/
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+/* sim65 */
+#include "chipif.h"
+
+
+
+/*****************************************************************************/
+/* Forwards */
+/*****************************************************************************/
+
+
+
+static int InitChip (const struct SimData* Data);
+/* Initialize the chip, return an error code */
+
+static void* InitInstance (unsigned Addr, unsigned Range, void* CfgInfo);
+/* Initialize a new chip instance */
+
+static void WriteCtrl (void* Data, unsigned Offs, unsigned char Val);
+/* Write control data */
+
+static void Write (void* Data, unsigned Offs, unsigned char Val);
+/* Write user data */
+
+static unsigned char ReadCtrl (void* Data, unsigned Offs);
+/* Read control data */
+
+static unsigned char Read (void* Data, unsigned Offs);
+/* Read user data */
+
+
+
+/*****************************************************************************/
+/* Data */
+/*****************************************************************************/
+
+
+
+/* Control data passed to the main program */
+static const struct ChipData ROMData[1] = {
+ {
+ "ROM", /* Name of the chip */
+ CHIPDATA_TYPE_CHIP, /* Type of the chip */
+ CHIPDATA_VER_MAJOR, /* Version information */
+ CHIPDATA_VER_MINOR,
+
+ /* -- Exported functions -- */
+ InitChip,
+ InitInstance,
+ WriteCtrl,
+ Write,
+ ReadCtrl,
+ Read
+ }
+};
+
+/* The SimData pointer we get when InitChip is called */
+static const SimData* Sim;
+
+/* Data for one ROM instance */
+typedef struct InstanceData InstanceData;
+struct InstanceData {
+ unsigned BaseAddr; /* Base address */
+ unsigned Range; /* Memory range */
+ unsigned char* Mem; /* The memory itself */
+};
+
+
+
+/*****************************************************************************/
+/* Exported function */
+/*****************************************************************************/
+
+
+
+int GetChipData (const ChipData** Data, unsigned* Count)
+{
+ /* Pass the control structure to the caller */
+ *Data = ROMData;
+ *Count = sizeof (Data) / sizeof (Data[0]);
+
+ /* Call was successful */
+ return 0;
+}
+
+
+
+/*****************************************************************************/
+/* Code */
+/*****************************************************************************/
+
+
+
+static int InitChip (const struct SimData* Data)
+/* Initialize the chip, return an error code */
+{
+ /* Remember the pointer */
+ Sim = Data;
+
+ /* Always successful */
+ return 0;
+}
+
+
+
+static void* InitInstance (unsigned Addr, unsigned Range, void* CfgInfo)
+/* Initialize a new chip instance */
+{
+ char* Name;
+ FILE* F;
+
+ /* Allocate a new instance structure */
+ InstanceData* D = Sim->Malloc (sizeof (InstanceData));
+
+ /* Initialize the structure, allocate RAM and attribute memory */
+ D->BaseAddr = Addr;
+ D->Range = Range;
+ D->Mem = Sim->Malloc (Range);
+
+ /* We must have a "file" attribute. Get it. */
+ if (Sim->GetCfgStr (CfgInfo, "file", &Name) == 0) {
+ /* Attribute not found */
+ Sim->Error ("Attribute `file' missing"); /* ### */
+ }
+
+ /* Open the file with the given name */
+ F = fopen (Name, "rb");
+ if (F == 0) {
+ Sim->Error ("Cannot open `%s': %s", Name, strerror (errno));
+ }
+
+ /* Read the file into the memory */
+ if (fread (D->Mem, 1, D->Range, F) != D->Range) {
+ Sim->Warning ("Cannot read %u bytes from file `%s'", D->Range, Name);
+ }
+
+ /* Close the file */
+ fclose (F);
+
+ /* Free the file name */
+ Sim->Free (Name);
+
+ /* Done, return the instance data */
+ return D;
+}
+
+
+
+static void WriteCtrl (void* Data, unsigned Offs, unsigned char Val)
+/* Write control data */
+{
+ /* Cast the data pointer */
+ InstanceData* D = (InstanceData*) Data;
+
+ /* Do the write */
+ D->Mem[Offs] = Val;
+}
+
+
+
+static void Write (void* Data, unsigned Offs, unsigned char Val)
+/* Write user data */
+{
+ /* Cast the data pointer */
+ InstanceData* D = (InstanceData*) Data;
+
+ /* Print a warning */
+ Sim->Break ("Writing to write protected memory at $%04X (value = $%02X)",
+ D->BaseAddr+Offs, Val);
+}
+
+
+
+static unsigned char ReadCtrl (void* Data, unsigned Offs)
+/* Read control data */
+{
+ /* Cast the data pointer */
+ InstanceData* D = (InstanceData*) Data;
+
+ /* Read the cell and return the value */
+ return D->Mem[Offs];
+}
+
+
+
+static unsigned char Read (void* Data, unsigned Offs)
+/* Read user data */
+{
+ /* Cast the data pointer */
+ InstanceData* D = (InstanceData*) Data;
+
+ /* Read the cell and return the value */
+ return D->Mem[Offs];
+}
+
+
+
/* */
/* */
/* */
-/* (C) 2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* (C) 2002-2003 Ullrich von Bassewitz */
+/* Römerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
-int InitChip (const struct SimData* Data);
+static int InitChip (const struct SimData* Data);
/* Initialize the chip, return an error code */
static void* InitInstance (unsigned Addr, unsigned Range, void* CfgInfo);
/* Control data passed to the main program */
-static const struct ChipData RAMData[1] = {
+static const struct ChipData STDIOData[1] = {
{
"STDIO", /* Name of the chip */
+ CHIPDATA_TYPE_CHIP, /* Type of the chip */
CHIPDATA_VER_MAJOR, /* Version information */
CHIPDATA_VER_MINOR,
int GetChipData (const ChipData** Data, unsigned* Count)
{
/* Pass the control structure to the caller */
- *Data = RAMData;
+ *Data = STDIOData;
*Count = sizeof (Data) / sizeof (Data[0]);
/* Call was successful */
-int InitChip (const struct SimData* Data)
+static int InitChip (const struct SimData* Data)
/* Initialize the chip, return an error code */
{
/* Remember the pointer */
CollDelete (&L->Attributes, Index);
/* Create the chip instance for the address range */
- Range = L->End - L->Start;
+ Range = L->End - L->Start + 1;
CI = NewChipInstance (D->V.SVal, L->Start, Range, &L->Attributes);
/* Delete the "name" attribute */
+#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
/* common */
#include "abend.h"
#include "attrib.h"
#include "print.h"
+#include "xsprintf.h"
/* sim65 */
#include "cputype.h"
/* */
int CPUHalted;
+/* Break message */
+static char BreakMsg[1024];
+
/*****************************************************************************/
+void Break (const char* Format, ...)
+/* Stop running and display the given message */
+{
+ va_list ap;
+ va_start (ap, Format);
+ xvsprintf (BreakMsg, sizeof (BreakMsg), Format, ap);
+ va_end (ap);
+}
+
+
+
void CPURun (void)
/* Run the CPU */
{
/* Get the next opcode */
unsigned char OPC = MemReadByte (PC);
- printf ("%6lu %04X %02X A=%02X X=%02X Y=%02X %c%c%c%c%c%c%c\n",
+ printf ("%9lu %06X %02X A=%02X X=%02X Y=%02X %c%c%c%c%c%c%c\n",
TotalCycles, PC, OPC, AC, XR, YR,
GET_SF()? 'S' : '-',
GET_ZF()? 'Z' : '-',
/* Count cycles */
TotalCycles += Cycles;
+
+ if (BreakMsg[0]) {
+ printf ("%s\n", BreakMsg);
+ BreakMsg[0] = '\0';
+ }
}
}
void NMI (void);
/* Generate an NMI */
+void Break (const char* Format, ...);
+/* Stop running and display the given message */
+
void CPURun (void);
/* Run the CPU */
/* */
/* */
/* */
-/* (C) 2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
+/* (C) 2002-2003 Ullrich von Bassewitz */
+/* Römerstrasse 52 */
+/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
/* Read in all files and treat them as libraries */
while ((E = readdir (D)) != 0) {
+ char* Name;
struct stat S;
+ /* ### Ignore anything buy *.so files */
+ unsigned NameLen = strlen (E->d_name);
+ if (NameLen <= 3) {
+ continue;
+ }
+ if (strcmp (E->d_name + NameLen - 3, ".so") != 0) {
+ continue;
+ }
+
/* Create the full file name */
- char* Name = xmalloc (DirLen + 1 + strlen (E->d_name) + 1);
+ Name = xmalloc (DirLen + 1 + NameLen + 1);
strcpy (Name, Arg);
strcpy (Name + DirLen, "/");
strcpy (Name + DirLen + 1, E->d_name);
CfgRead ();
CPUInit ();
-#if 0
+#if 1
CPURun ();
#endif
/* */
/* */
/* */
-/* (C) 2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
+/* (C) 2002-2003 Ullrich von Bassewitz */
+/* Römerstrasse 52 */
+/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
default:
Internal ("Unexpected CPU type: %d", CPU);
}
- MemData = xmalloc (MemSize);
+ MemData = xmalloc (MemSize * sizeof (ChipInstance*));
/* Clear the memory */
for (I = 0; I < MemSize; ++I) {
/* */
/* */
/* */
-/* (C) 2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
+/* (C) 2002-2003 Ullrich von Bassewitz */
+/* Römerstrasse 52 */
+/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
void (*Internal) (const char* Format, ...);
/* Print an internal program error and terminate */
+ void (*Break) (const char* Format, ...);
+ /* Stop the CPU and display the given message */
+
int (*GetCfgId) (void* CfgInfo, const char* Name, char** Id);
/* Search CfgInfo for an attribute with the given name and type "id". If
* found, remove it from the configuration, pass a pointer to a dynamically
*/
int (*GetCfgStr) (void* CfgInfo, const char* Name, char** S);
- /* Search CfgInfo for an attribute with the given name and type "id". If
- * found, remove it from the configuration, pass a pointer to a dynamically
- * allocated string containing the value to Id, and return true. If not
- * found, return false. The memory passed in S must be free by a call to
- * Free();
+ /* Search CfgInfo for an attribute with the given name and type "string".
+ * If found, remove it from the configuration, pass a pointer to a
+ * dynamically allocated string containing the value to S, and return
+ * true. If not found, return false. The memory passed in S must be free
+ * by a call to Free();
*/
int (*GetCfgNum) (void* CfgInfo, const char* Name, long* Val);
projects / cc65 / commitdiff