d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor formatting changes

Browse source 
sim.c:
remove stray tracing statements
make formatting consistently leading tabs

Makefile:
restore ACK_TEMP_DIR & CC to default settings
This commit is contained in:
tevorbl 2020-06-13 14:33:14 +01:00
parent 6fe335b9e9
commit cd36c3526b
2 changed files with 66 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -9,8 +9,7 @@ DEFAULT_PLATFORM = pc86
# Where should the ACK put its temporary files? # Where should the ACK put its temporary files?
#ACK_TEMP_DIR = /tmp ACK_TEMP_DIR = /tmp
ACK_TEMP_DIR = tmp
# Where is the ACK going to be installed, eventually? If you don't want to # Where is the ACK going to be installed, eventually? If you don't want to
# install it and just want to run the ACK from the build directory # install it and just want to run the ACK from the build directory
@ -32,7 +31,6 @@ LDFLAGS =
AR = ar AR = ar
CC = gcc CC = gcc
#CC = clang
# Which build system to use; use 'ninja' or 'make' (in lower case). Leave # Which build system to use; use 'ninja' or 'make' (in lower case). Leave
# blank to autodetect. # blank to autodetect.

134
plat/linux68k/emu/sim.c
View file

@ -75,7 +75,7 @@ void exit_error(char* fmt, ...)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
pc = m68k_get_reg(NULL, M68K_REG_PPC); pc = m68k_get_reg(NULL, M68K_REG_PPC);
m68k_disassemble(buff, pc, M68K_CPU_TYPE_68020); m68k_disassemble(buff, pc, M68K_CPU_TYPE_68020);
fprintf(stderr, "At %04x: %s\n", pc, buff); fprintf(stderr, "At %04x: %s\n", pc, buff);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -93,7 +93,7 @@ uint32_t cpu_read_long(uint32_t address)
switch (address) switch (address)
{ {
case 0x00: return INIT_SP; case 0x00: return INIT_SP;
case 0x04: return entrypoint; case 0x04: return entrypoint;
case 0x80: emulated_syscall(); return 0x10000; case 0x80: emulated_syscall(); return 0x10000;
case 0x10000: return 0x4e734e73; /* rte; rte */ case 0x10000: return 0x4e734e73; /* rte; rte */
case 0x10004: return 0; case 0x10004: return 0;
@ -173,12 +173,13 @@ void disassemble_program()
char buff2[100]; char buff2[100];
pc = cpu_read_long_dasm(4); pc = cpu_read_long_dasm(4);
printf("entry point is %0x\n", entrypoint); printf("entry point is %0x\n", entrypoint);
printf("pc is %0x\n", pc); printf("pc is %0x\n", pc);
while(pc <= entrypoint + 0x16e)
while(pc <= entrypoint + 0x16e)
{ {
instr_size = m68k_disassemble(buff, pc, M68K_CPU_TYPE_68020); instr_size = m68k_disassemble(buff, pc, M68K_CPU_TYPE_68020);
make_hex(buff2, pc, instr_size); make_hex(buff2, pc, instr_size);
printf("%03x: %-20s: %s\n", pc, buff2, buff); printf("%03x: %-20s: %s\n", pc, buff2, buff);
pc += instr_size; pc += instr_size;
@ -236,58 +237,58 @@ static void emulated_syscall(void)
{ {
case 1: /* exit */ case 1: /* exit */
exit(m68k_get_reg(NULL, M68K_REG_D1)); exit(m68k_get_reg(NULL, M68K_REG_D1));
case 3: /* read */ case 3: /* read */
{ {
uint32_t fd = m68k_get_reg(NULL, M68K_REG_D1); uint32_t fd = m68k_get_reg(NULL, M68K_REG_D1);
uint32_t ptr = m68k_get_reg(NULL, M68K_REG_D2); uint32_t ptr = m68k_get_reg(NULL, M68K_REG_D2);
uint32_t count = m68k_get_reg(NULL, M68K_REG_D3); uint32_t count = m68k_get_reg(NULL, M68K_REG_D3);
m68k_set_reg(M68K_REG_D0, read(fd, g_ram + transform_address(ptr), count)); m68k_set_reg(M68K_REG_D0, read(fd, g_ram + transform_address(ptr), count));
break; break;
} }
case 4: /* write */ case 4: /* write */
{ {
uint32_t fd = m68k_get_reg(NULL, M68K_REG_D1); uint32_t fd = m68k_get_reg(NULL, M68K_REG_D1);
uint32_t ptr = m68k_get_reg(NULL, M68K_REG_D2); uint32_t ptr = m68k_get_reg(NULL, M68K_REG_D2);
uint32_t len = m68k_get_reg(NULL, M68K_REG_D3); uint32_t len = m68k_get_reg(NULL, M68K_REG_D3);
m68k_set_reg(M68K_REG_D0, write(fd, g_ram + transform_address(ptr), len)); m68k_set_reg(M68K_REG_D0, write(fd, g_ram + transform_address(ptr), len));
break; break;
} }
case 5: /* open */ case 5: /* open */
{ {
uint32_t pathname = m68k_get_reg(NULL, M68K_REG_D1); uint32_t pathname = m68k_get_reg(NULL, M68K_REG_D1);
uint32_t flags = m68k_get_reg(NULL, M68K_REG_D2); uint32_t flags = m68k_get_reg(NULL, M68K_REG_D2);
uint32_t mode = m68k_get_reg(NULL, M68K_REG_D3); uint32_t mode = m68k_get_reg(NULL, M68K_REG_D3);
m68k_set_reg(M68K_REG_D0, open(g_ram + transform_address(pathname), flags, mode)); m68k_set_reg(M68K_REG_D0, open(g_ram + transform_address(pathname), flags, mode));
break; break;
} }
case 6: /* close */ case 6: /* close */
{ {
uint32_t fd = m68k_get_reg(NULL, M68K_REG_D1); uint32_t fd = m68k_get_reg(NULL, M68K_REG_D1);
m68k_set_reg(M68K_REG_D0, close(fd)); m68k_set_reg(M68K_REG_D0, close(fd));
break; break;
} }
case 10: /* unlink */ case 10: /* unlink */
{ {
uint32_t pathname = m68k_get_reg(NULL, M68K_REG_D1); uint32_t pathname = m68k_get_reg(NULL, M68K_REG_D1);
m68k_set_reg(M68K_REG_D0, unlink(g_ram + transform_address(pathname))); m68k_set_reg(M68K_REG_D0, unlink(g_ram + transform_address(pathname)));
break; break;
} }
case 19: /* lseek */ case 19: /* lseek */
{ {
uint32_t fd = m68k_get_reg(NULL, M68K_REG_D1); uint32_t fd = m68k_get_reg(NULL, M68K_REG_D1);
uint32_t offset = m68k_get_reg(NULL, M68K_REG_D2); uint32_t offset = m68k_get_reg(NULL, M68K_REG_D2);
uint32_t whence = m68k_get_reg(NULL, M68K_REG_D3); uint32_t whence = m68k_get_reg(NULL, M68K_REG_D3);
m68k_set_reg(M68K_REG_D0, lseek(fd, offset, whence)); m68k_set_reg(M68K_REG_D0, lseek(fd, offset, whence));
break; break;
} }
case 45: /* brk */ case 45: /* brk */
{ {
uint32_t newpos = m68k_get_reg(NULL, M68K_REG_D1); uint32_t newpos = m68k_get_reg(NULL, M68K_REG_D1);
if (newpos == 0) if (newpos == 0)
@ -302,8 +303,8 @@ static void emulated_syscall(void)
break; break;
} }
case 20: /* getpid */ case 20: /* getpid */
case 48: /* signal */ case 48: /* signal */
case 54: /* ioctl */ case 54: /* ioctl */
case 78: /* gettimeofday */ case 78: /* gettimeofday */
m68k_set_reg(M68K_REG_D0, 0); m68k_set_reg(M68K_REG_D0, 0);
@ -331,9 +332,9 @@ static void load_program(FILE* fd)
if (fread(g_ram, 1, phentsize, fd) != phentsize) if (fread(g_ram, 1, phentsize, fd) != phentsize)
exit_error("couldn't read program header"); exit_error("couldn't read program header");
uint32_t offset = READ_LONG(g_ram, 0x04); uint32_t offset = READ_LONG(g_ram, 0x04);
uint32_t vaddr = READ_LONG(g_ram, 0x08); uint32_t vaddr = READ_LONG(g_ram, 0x08);
uint32_t filesz = READ_LONG(g_ram, 0x10); uint32_t filesz = READ_LONG(g_ram, 0x10);
uint32_t memsz = READ_LONG(g_ram, 0x14); uint32_t memsz = READ_LONG(g_ram, 0x14);
brkbase = brkpos = vaddr + memsz; brkbase = brkpos = vaddr + memsz;
@ -361,23 +362,19 @@ int main(int argc, char* argv[])
load_program(fhandle); load_program(fhandle);
//disassemble_program(); //disassemble_program();
//printf("now at line %d\n", __LINE__); m68k_set_cpu_type(M68K_CPU_TYPE_68040);
m68k_set_cpu_type(M68K_CPU_TYPE_68040); m68k_init();
//printf("now at line %d\n", __LINE__); m68k_pulse_reset();
m68k_init();
//printf("initialising core\n");
m68k_pulse_reset();
//printf("now at line %d\n", __LINE__);
/* On entry, the Linux stack looks like this. /* On entry, the Linux stack looks like this.
* *
* sp+.. NULL * sp+.. NULL
* sp+8+(4*argc) env (X quads) * sp+8+(4*argc) env (X quads)
* sp+4+(4*argc) NULL * sp+4+(4*argc) NULL
* sp+4 argv (argc quads) * sp+4 argv (argc quads)
* sp argc * sp argc
* *
* We'll set it up with a bodgy stack frame with argc=0 just to keep the * We'll set it up with a bodgy stack frame with argc=0 just to keep the
* startup code happy. * startup code happy.
@ -392,13 +389,12 @@ int main(int argc, char* argv[])
unsigned long argv = sp; unsigned long argv = sp;
cpu_write_long(sp -= 4, argv); cpu_write_long(sp -= 4, argv);
cpu_write_long(sp -= 4, 0); cpu_write_long(sp -= 4, 0);
m68k_set_reg(M68K_REG_SP, sp); /* init sp is also addr 0 */ m68k_set_reg(M68K_REG_SP, sp); /* init sp is also addr 0 */
} }
//printf("running program "); for (;;) {
for (;;) { m68k_execute(100000);
m68k_execute(100000); }
}
return 0; return 0;
} }