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
Makefile
plat/linux68k/emu
sim.c

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.

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

@ -176,6 +176,7 @@ void disassemble_program()
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);
@ -363,13 +364,9 @@ int main(int argc, char* argv[])
//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);
//printf("now at line %d\n", __LINE__);
m68k_init(); m68k_init();
//printf("initialising core\n");
m68k_pulse_reset(); 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.
* *
@ -395,7 +392,6 @@ int main(int argc, char* argv[])
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);
} }