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

Comparing SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp (file contents):
Revision 1.47 by gbeauche, 2004-06-24T15:37:26Z vs.
Revision 1.53 by gbeauche, 2004-11-22T22:04:38Z

# Line 42 | Line 42
42  
43   #include <stdio.h>
44   #include <stdlib.h>
45 + #ifdef HAVE_MALLOC_H
46 + #include <malloc.h>
47 + #endif
48  
49   #ifdef USE_SDL_VIDEO
50   #include <SDL_events.h>
# Line 105 | Line 108 | const uint32 POWERPC_EXEC_RETURN = POWER
108   // Interrupts in native mode?
109   #define INTERRUPTS_IN_NATIVE_MODE 1
110  
108 // Enable native EMUL_OPs to be run without a mode switch
109 #define ENABLE_NATIVE_EMUL_OP 1
110
111   // Pointer to Kernel Data
112 < static KernelData * const kernel_data = (KernelData *)KERNEL_DATA_BASE;
112 > static KernelData * kernel_data;
113  
114   // SIGSEGV handler
115 < static sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
115 > sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
116  
117   #if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
118   // Special trampolines for EmulOp and NativeOp
# Line 142 | Line 142 | class sheepshaver_cpu
142          void init_decoder();
143          void execute_sheep(uint32 opcode);
144  
145        // Filter out EMUL_OP routines that only call native code
146        bool filter_execute_emul_op(uint32 emul_op);
147
148        // "Native" EMUL_OP routines
149        void execute_emul_op_microseconds();
150        void execute_emul_op_idle_time_1();
151        void execute_emul_op_idle_time_2();
152
145          // CPU context to preserve on interrupt
146          class interrupt_context {
147                  uint32 gpr[32];
# Line 191 | Line 183 | public:
183          // Execute MacOS/PPC code
184          uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
185  
186 + #if PPC_ENABLE_JIT
187          // Compile one instruction
188          virtual int compile1(codegen_context_t & cg_context);
189 <
189 > #endif
190          // Resource manager thunk
191          void get_resource(uint32 old_get_resource);
192  
# Line 274 | Line 267 | typedef bit_field< 19, 19 > FN_field;
267   typedef bit_field< 20, 25 > NATIVE_OP_field;
268   typedef bit_field< 26, 31 > EMUL_OP_field;
269  
277 // "Native" EMUL_OP routines
278 #define GPR_A(REG) gpr(16 + (REG))
279 #define GPR_D(REG) gpr( 8 + (REG))
280
281 void sheepshaver_cpu::execute_emul_op_microseconds()
282 {
283        Microseconds(GPR_A(0), GPR_D(0));
284 }
285
286 void sheepshaver_cpu::execute_emul_op_idle_time_1()
287 {
288        // Sleep if no events pending
289        if (ReadMacInt32(0x14c) == 0)
290                Delay_usec(16667);
291        GPR_A(0) = ReadMacInt32(0x2b6);
292 }
293
294 void sheepshaver_cpu::execute_emul_op_idle_time_2()
295 {
296        // Sleep if no events pending
297        if (ReadMacInt32(0x14c) == 0)
298                Delay_usec(16667);
299        GPR_D(0) = (uint32)-2;
300 }
301
302 // Filter out EMUL_OP routines that only call native code
303 bool sheepshaver_cpu::filter_execute_emul_op(uint32 emul_op)
304 {
305        switch (emul_op) {
306        case OP_MICROSECONDS:
307                execute_emul_op_microseconds();
308                return true;
309        case OP_IDLE_TIME:
310                execute_emul_op_idle_time_1();
311                return true;
312        case OP_IDLE_TIME_2:
313                execute_emul_op_idle_time_2();
314                return true;
315        }
316        return false;
317 }
318
270   // Execute EMUL_OP routine
271   void sheepshaver_cpu::execute_emul_op(uint32 emul_op)
272   {
322 #if ENABLE_NATIVE_EMUL_OP
323        // First, filter out EMUL_OPs that can be executed without a mode switch
324        if (filter_execute_emul_op(emul_op))
325                return;
326 #endif
327
273          M68kRegisters r68;
274          WriteMacInt32(XLM_68K_R25, gpr(25));
275          WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
# Line 377 | Line 322 | void sheepshaver_cpu::execute_sheep(uint
322   }
323  
324   // Compile one instruction
325 + #if PPC_ENABLE_JIT
326   int sheepshaver_cpu::compile1(codegen_context_t & cg_context)
327   {
382 #if PPC_ENABLE_JIT
328          const instr_info_t *ii = cg_context.instr_info;
329          if (ii->mnemo != PPC_I(SHEEP))
330                  return COMPILE_FAILURE;
# Line 506 | Line 451 | int sheepshaver_cpu::compile1(codegen_co
451  
452          default: {      // EMUL_OP
453                  uint32 emul_op = EMUL_OP_field::extract(opcode) - 3;
509 #if ENABLE_NATIVE_EMUL_OP
510                typedef void (*emul_op_func_t)(dyngen_cpu_base);
511                emul_op_func_t emul_op_func = 0;
512                switch (emul_op) {
513                case OP_MICROSECONDS:
514                        emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_microseconds).ptr();
515                        break;
516                case OP_IDLE_TIME:
517                        emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_idle_time_1).ptr();
518                        break;
519                case OP_IDLE_TIME_2:
520                        emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_idle_time_2).ptr();
521                        break;
522                }
523                if (emul_op_func) {
524                        dg.gen_invoke_CPU(emul_op_func);
525                        cg_context.done_compile = false;
526                        status = COMPILE_CODE_OK;
527                        break;
528                }
529 #endif
454   #if PPC_REENTRANT_JIT
455                  // Try to execute EmulOp trampoline
456                  dg.gen_set_PC_im(cg_context.pc + 4);
# Line 546 | Line 470 | int sheepshaver_cpu::compile1(codegen_co
470          }
471          }
472          return status;
549 #endif
550        return COMPILE_FAILURE;
473   }
474 + #endif
475  
476   // CPU context to preserve on interrupt
477   sheepshaver_cpu::interrupt_context::interrupt_context(sheepshaver_cpu *_cpu, const char *_where)
# Line 880 | Line 803 | static void dump_log(void)
803   *  Initialize CPU emulation
804   */
805  
806 < static sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
806 > sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
807   {
808   #if ENABLE_VOSF
809          // Handle screen fault
# Line 892 | Line 815 | static sigsegv_return_t sigsegv_handler(
815          const uintptr addr = (uintptr)fault_address;
816   #if HAVE_SIGSEGV_SKIP_INSTRUCTION
817          // Ignore writes to ROM
818 <        if ((addr - ROM_BASE) < ROM_SIZE)
818 >        if ((addr - (uintptr)ROMBaseHost) < ROM_SIZE)
819                  return SIGSEGV_RETURN_SKIP_INSTRUCTION;
820  
821          // Get program counter of target CPU
# Line 952 | Line 875 | static sigsegv_return_t sigsegv_handler(
875  
876   void init_emul_ppc(void)
877   {
878 +        // Get pointer to KernelData in host address space
879 +        kernel_data = (KernelData *)Mac2HostAddr(KERNEL_DATA_BASE);
880 +
881          // Initialize main CPU emulator
882          ppc_cpu = new sheepshaver_cpu();
883          ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
884          ppc_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
885          WriteMacInt32(XLM_RUN_MODE, MODE_68K);
886  
961        // Install the handler for SIGSEGV
962        sigsegv_install_handler(sigsegv_handler);
963
887   #if ENABLE_MON
888          // Install "regs" command in cxmon
889          mon_add_command("regs", dump_registers, "regs                     Dump PowerPC registers\n");
# Line 1125 | Line 1048 | void sheepshaver_cpu::handle_interrupt(v
1048                          M68kRegisters r;
1049                          uint32 old_r25 = ReadMacInt32(XLM_68K_R25);     // Save interrupt level
1050                          WriteMacInt32(XLM_68K_R25, 0x21);                       // Execute with interrupt level 1
1051 <                        static const uint8 proc[] = {
1051 >                        static const uint8 proc_template[] = {
1052                                  0x3f, 0x3c, 0x00, 0x00,                 // move.w       #$0000,-(sp)    (fake format word)
1053                                  0x48, 0x7a, 0x00, 0x0a,                 // pea          @1(pc)                  (return address)
1054                                  0x40, 0xe7,                                             // move         sr,-(sp)                (saved SR)
# Line 1133 | Line 1056 | void sheepshaver_cpu::handle_interrupt(v
1056                                  0x4e, 0xd0,                                             // jmp          (a0)
1057                                  M68K_RTS >> 8, M68K_RTS & 0xff  // @1
1058                          };
1059 <                        Execute68k((uint32)proc, &r);
1059 >                        BUILD_SHEEPSHAVER_PROCEDURE(proc);
1060 >                        Execute68k(proc, &r);
1061                          WriteMacInt32(XLM_68K_R25, old_r25);            // Restore interrupt level
1062   #else
1063                          // Only update cursor
# Line 1182 | Line 1106 | void sheepshaver_cpu::execute_native_op(
1106                  VideoVBL();
1107                  break;
1108          case NATIVE_VIDEO_DO_DRIVER_IO:
1109 <                gpr(3) = (int32)(int16)VideoDoDriverIO((void *)gpr(3), (void *)gpr(4),
1186 <                                                                                           (void *)gpr(5), gpr(6), gpr(7));
1109 >                gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7));
1110                  break;
1111   #ifdef WORDS_BIGENDIAN
1112          case NATIVE_ETHER_IRQ:
# Line 1268 | Line 1191 | void sheepshaver_cpu::execute_native_op(
1191                  break;
1192          }
1193          case NATIVE_MAKE_EXECUTABLE:
1194 <                MakeExecutable(0, (void *)gpr(4), gpr(5));
1194 >                MakeExecutable(0, gpr(4), gpr(5));
1195                  break;
1196          case NATIVE_CHECK_LOAD_INVOC:
1197                  check_load_invoc(gpr(3), gpr(4), gpr(5));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines