Retro/ScriptedAmigaEmulator
Watch
1
0
Fork
You've already forked ScriptedAmigaEmulator
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update

Browse source
This commit is contained in:
Rupert Hausberger 2016-08-01 22:32:29 +02:00
commit 8367c0d32e
2 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sae/amiga.js
View file

@ -390,7 +390,6 @@ function ScriptedAmigaEmulator() {
} }
this.start_program = function() { this.start_program = function() {
console.warn("stage 2");
this.do_start_program(); this.do_start_program();
if (typeof SAEV_config.hook.event.started === "function") if (typeof SAEV_config.hook.event.started === "function")
@ -448,8 +447,6 @@ console.warn("stage 2");
} }
SAEF_info("sae.start() starting..."); SAEF_info("sae.start() starting...");
console.warn("stage 1");
var err; var err;
if ((err = this.config.setup()) != SAEE_None) if ((err = this.config.setup()) != SAEE_None)
return err; return err;

12
sae/m68k.js
View file

@ -199,16 +199,12 @@ function SAEO_M68K() {
setTimeout(function() { SAER.m68k.m68k_cycle(0, 0); }, 0); setTimeout(function() { SAER.m68k.m68k_cycle(0, 0); }, 0);
} }
var counter = 0;
this.m68k_cycle = function(hardboot, startup) { this.m68k_cycle = function(hardboot, startup) {
try { try {
if (SAEV_command > 0) { if (SAEV_command > 0) {
cpu_keyboardreset = SAEV_command == SAEC_command_KeyboardReset; cpu_keyboardreset = SAEV_command == SAEC_command_KeyboardReset;
cpu_hardreset = ((SAEV_command == SAEC_command_HardReset ? 1 : 0) | hardboot) != 0; cpu_hardreset = ((SAEV_command == SAEC_command_HardReset ? 1 : 0) | hardboot) != 0;
console.warn("m68k_cycle() command start...", SAEV_command, cpu_hardreset);
if (SAEV_command == SAEC_command_Quit) { if (SAEV_command == SAEC_command_Quit) {
this.m68k_gone(); this.m68k_gone();
return; return;
@ -245,7 +241,6 @@ console.warn("m68k_cycle() command start...", SAEV_command, cpu_hardreset);
SAEV_config.hook.event.reseted(cpu_hardreset); SAEV_config.hook.event.reseted(cpu_hardreset);
cpu_hardreset = false; cpu_hardreset = false;
console.warn("m68k_cycle() ...command done", SAEV_command, cpu_hardreset);
} }
if (startup) { if (startup) {
@ -268,8 +263,6 @@ console.warn("m68k_cycle() ...command done", SAEV_command, cpu_hardreset);
if (prevtime !== false) // && SAEV_config.cpu.speed >= 0) if (prevtime !== false) // && SAEV_config.cpu.speed >= 0)
SAEV_Events_reflowtime = SAEF_now() - prevtime; SAEV_Events_reflowtime = SAEF_now() - prevtime;
console.log("loop", counter++);
SAER_CPU_run_func(); SAER_CPU_run_func();
//if (SAEV_config.cpu.speed >= 0) //if (SAEV_config.cpu.speed >= 0)
@ -291,17 +284,12 @@ console.log("loop", counter++);
var hardboot = 1; var hardboot = 1;
var startup = 1; var startup = 1;
console.warn("stage 3, calling setTimeout()...");
counter = 0;
//SAEF_info("m68k.m68k_go()"); //SAEF_info("m68k.m68k_go()");
SAER.events.reset_frame_rate_hack(); SAER.events.reset_frame_rate_hack();
SAER.running = true; SAER.running = true;
//this.m68k_cycle(1, 1); //this.m68k_cycle(1, 1);
setTimeout(function() { SAER.m68k.m68k_cycle(hardboot, startup); }, 0); setTimeout(function() { SAER.m68k.m68k_cycle(hardboot, startup); }, 0);
console.warn("stage 4, ...done");
} }
this.m68k_gone = function() { this.m68k_gone = function() {
//SAEF_info("m68k.m68k_gone()"); //SAEF_info("m68k.m68k_gone()");