ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/emul_op.cpp
(Generate patch)

Comparing SheepShaver/src/emul_op.cpp (file contents):
Revision 1.7 by gbeauche, 2004-01-10T08:46:56Z vs.
Revision 1.12 by gbeauche, 2004-05-31T11:00:13Z

# Line 1 | Line 1
1   /*
2   *  emul_op.cpp - 68k opcodes for ROM patches
3   *
4 < *  SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 288 | Line 288 | void EmulOp(M68kRegisters *r, uint32 pc,
288                          MacOSUtilReset();
289                          AudioReset();
290   #if 0
291 <                        printf("DR activated\n");
291 >                        // Enable DR emulator
292 >                        D(bug("DR activated\n"));
293                          WriteMacInt32(KernelDataAddr + 0x17a0, 3);              // Prepare for DR emulator activation
294                          WriteMacInt32(KernelDataAddr + 0x17c0, DR_CACHE_BASE);
295                          WriteMacInt32(KernelDataAddr + 0x17c4, DR_CACHE_SIZE);
296 <                        WriteMacInt32(KernelDataAddr + 0x1b00, DR_CACHE_BASE + 0x10000);
297 <                        memcpy((void *)(DR_CACHE_BASE + 0x10000), (void *)(ROM_BASE + 0x370000), 0x10000);
298 <                        clear_caches((void *)(DR_CACHE_BASE + 0x10000), 0x10000, B_INVALIDATE_ICACHE | B_FLUSH_DCACHE);
296 >                        WriteMacInt32(KernelDataAddr + 0x1b04, DR_CACHE_BASE);
297 >                        WriteMacInt32(KernelDataAddr + 0x1b00, DR_EMULATOR_BASE);
298 >                        memcpy((void *)DR_EMULATOR_BASE, (void *)(ROM_BASE + 0x370000), DR_EMULATOR_SIZE);
299 >                        MakeExecutable(0, (void *)DR_EMULATOR_BASE, DR_EMULATOR_SIZE);
300   #endif
301                          break;
302  
# Line 456 | Line 458 | void EmulOp(M68kRegisters *r, uint32 pc,
458                          break;
459  
460                  case OP_IDLE_TIME:
459 – #if __BEOS__
461                          // Sleep if no events pending
462 <                        if (ReadMacInt32(0x14c) == 0) {
463 <                                sleep(16667);
463 <                        }
464 < #endif
462 >                        if (ReadMacInt32(0x14c) == 0)
463 >                                Delay_usec(16667);
464                          r->a[0] = ReadMacInt32(0x2b6);
465                          break;
466  
467 +                case OP_IDLE_TIME_2:
468 +                        // Sleep if no events pending
469 +                        if (ReadMacInt32(0x14c) == 0)
470 +                                Delay_usec(16667);
471 +                        r->d[0] = (uint32)-2;
472 +                        break;
473 +
474                  default:
475                          printf("FATAL: EMUL_OP called with bogus selector %08x\n", selector);
476                          QuitEmulator();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines