folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AltairZ80: Adds "rom" option to "load -h"

Browse source 
Adds "rom" option to set pages to ROM when loading an Intel
HEX file.
This commit is contained in:
Patrick Linstruth 2024-09-04 20:10:48 -04:00 • committed by Paul Koning
parent 36605c4950
commit 2437b13fb1
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
AltairZ80/altairz80_cpu.c
View file

@ -209,6 +209,7 @@ uint32 getCommon(void);
uint32 sim_map_resource(uint32 baseaddr, uint32 size, uint32 resource_type, uint32 sim_map_resource(uint32 baseaddr, uint32 size, uint32 resource_type,
int32 (*routine)(const int32, const int32, const int32), const char* name, uint8 unmap); int32 (*routine)(const int32, const int32, const int32), const char* name, uint8 unmap);
static void PutBYTEasROMorRAM(register uint32 Addr, const register uint32 Value, const register uint32 makeROM);
void PutBYTEExtended(register uint32 Addr, const register uint32 Value); void PutBYTEExtended(register uint32 Addr, const register uint32 Value);
uint32 GetBYTEExtended(register uint32 Addr); uint32 GetBYTEExtended(register uint32 Addr);
void cpu_raise_interrupt(uint32 irq); void cpu_raise_interrupt(uint32 irq);
@ -1937,6 +1938,15 @@ static void PutBYTE(register uint32 Addr, const register uint32 Value) {
} }
} }
static void PutBYTEasROMorRAM(register uint32 Addr, const register uint32 Value, const register uint32 makeROM) {
Addr &= ADDRMASK; /* registers are NOT guaranteed to be always 16-bit values */
if ((cpu_unit.flags & UNIT_CPU_BANKED) && (((common_low == 0) && (Addr < common)) || ((common_low == 1) && (Addr >= common))))
Addr |= bankSelect << MAXBANKSIZELOG2;
mmu_table[Addr >> LOG2PAGESIZE] = makeROM ? ROM_PAGE : RAM_PAGE;
M[Addr] = Value;
}
void PutBYTEExtended(register uint32 Addr, const register uint32 Value) { void PutBYTEExtended(register uint32 Addr, const register uint32 Value) {
MDEV m; MDEV m;
@ -7507,10 +7517,17 @@ t_stat sim_load(FILE *fileref, CONST char *cptr, CONST char *fnam, int flag) {
https://deramp.com/downloads/misc_software/hex-binary utilities for the PC/ https://deramp.com/downloads/misc_software/hex-binary utilities for the PC/
*/ */
static t_stat cpu_hex_load(FILE *fileref, CONST char *cptr, CONST char *fnam, int flag) { static t_stat cpu_hex_load(FILE *fileref, CONST char *cptr, CONST char *fnam, int flag) {
char gbuf[CBUFSIZE];
char linebuf[1024], datastr[1024], *bufptr; char linebuf[1024], datastr[1024], *bufptr;
int32 bytecnt, rectype, databyte, chksum, line = 0, cnt = 0; int32 bytecnt, rectype, databyte, chksum, line = 0, cnt = 0;
uint32 makeROM = FALSE;
t_addr addr, org = 0; t_addr addr, org = 0;
get_glyph(cptr, gbuf, 0);
if (strcmp(gbuf, "ROM") == 0) {
makeROM = TRUE;
}
while (!feof(fileref)) { while (!feof(fileref)) {
if (fgets(linebuf, sizeof(linebuf), fileref) == NULL) if (fgets(linebuf, sizeof(linebuf), fileref) == NULL)
break; break;
@ -7548,7 +7565,7 @@ static t_stat cpu_hex_load(FILE *fileref, CONST char *cptr, CONST char *fnam, in
} }
bufptr += 2; bufptr += 2;
PutBYTE(addr++, databyte); PutBYTEasROMorRAM(addr++, databyte, makeROM);
chksum += databyte; chksum += databyte;
cnt++; cnt++;
@ -7564,7 +7581,7 @@ static t_stat cpu_hex_load(FILE *fileref, CONST char *cptr, CONST char *fnam, in
} }
} }
return sim_messagef(SCPE_OK, "%d byte%s loaded at %x.\n", PLURAL(cnt), org); return sim_messagef(SCPE_OK, "%d byte%s loaded at %x%s.\n", PLURAL(cnt), org, (makeROM) ? " [ROM]" : "");
} }
void cpu_raise_interrupt(uint32 irq) { void cpu_raise_interrupt(uint32 irq) {