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.71 by gbeauche, 2006-07-09T12:15:48Z vs.
Revision 1.76 by asvitkine, 2009-08-18T18:26:11Z

# Line 1 | Line 1
1   /*
2   *  sheepshaver_glue.cpp - Glue Kheperix CPU to SheepShaver CPU engine interface
3   *
4 < *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2008 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 118 | Line 118 | static uint8 *emul_op_trampoline;
118   static uint8 *native_op_trampoline;
119   #endif
120  
121 // JIT Compiler enabled?
122 static inline bool enable_jit_p()
123 {
124        return PrefsFindBool("jit");
125 }
126
121  
122   /**
123   *              PowerPC emulator glue with special 'sheep' opcodes
# Line 177 | Line 171 | public:
171          void interrupt(uint32 entry);
172  
173          // Make sure the SIGSEGV handler can access CPU registers
174 <        friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
174 >        friend sigsegv_return_t sigsegv_handler(sigsegv_info_t *sip);
175   };
176  
177   sheepshaver_cpu::sheepshaver_cpu()
184        : powerpc_cpu(enable_jit_p())
178   {
179          init_decoder();
180 +
181 + #if PPC_ENABLE_JIT
182 +        if (PrefsFindBool("jit"))
183 +                enable_jit();
184 + #endif
185   }
186  
187   void sheepshaver_cpu::init_decoder()
# Line 191 | Line 189 | void sheepshaver_cpu::init_decoder()
189          static const instr_info_t sheep_ii_table[] = {
190                  { "sheep",
191                    (execute_pmf)&sheepshaver_cpu::execute_sheep,
194                  NULL,
192                    PPC_I(SHEEP),
193                    D_form, 6, 0, CFLOW_JUMP | CFLOW_TRAP
194                  }
# Line 733 | Line 730 | static void dump_log(void)
730   *  Initialize CPU emulation
731   */
732  
733 < sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
733 > sigsegv_return_t sigsegv_handler(sigsegv_info_t *sip)
734   {
735   #if ENABLE_VOSF
736          // Handle screen fault
737 <        extern bool Screen_fault_handler(sigsegv_address_t, sigsegv_address_t);
738 <        if (Screen_fault_handler(fault_address, fault_instruction))
737 >        extern bool Screen_fault_handler(sigsegv_info_t *sip);
738 >        if (Screen_fault_handler(sip))
739                  return SIGSEGV_RETURN_SUCCESS;
740   #endif
741  
742 <        const uintptr addr = (uintptr)fault_address;
742 >        const uintptr addr = (uintptr)sigsegv_get_fault_address(sip);
743   #if HAVE_SIGSEGV_SKIP_INSTRUCTION
744          // Ignore writes to ROM
745          if ((addr - (uintptr)ROMBaseHost) < ROM_SIZE)
# Line 753 | Line 750 | sigsegv_return_t sigsegv_handler(sigsegv
750          const uint32 pc = cpu->pc();
751          
752          // Fault in Mac ROM or RAM?
753 <        bool mac_fault = (pc >= ROM_BASE) && (pc < (ROM_BASE + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize)) || (pc >= DR_CACHE_BASE && pc < (DR_CACHE_BASE + DR_CACHE_SIZE));
753 >        bool mac_fault = (pc >= ROMBase) && (pc < (ROMBase + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize)) || (pc >= DR_CACHE_BASE && pc < (DR_CACHE_BASE + DR_CACHE_SIZE));
754          if (mac_fault) {
755  
756                  // "VM settings" during MacOS 8 installation
757 <                if (pc == ROM_BASE + 0x488160 && cpu->gpr(20) == 0xf8000000)
757 >                if (pc == ROMBase + 0x488160 && cpu->gpr(20) == 0xf8000000)
758                          return SIGSEGV_RETURN_SKIP_INSTRUCTION;
759          
760                  // MacOS 8.5 installation
761 <                else if (pc == ROM_BASE + 0x488140 && cpu->gpr(16) == 0xf8000000)
761 >                else if (pc == ROMBase + 0x488140 && cpu->gpr(16) == 0xf8000000)
762                          return SIGSEGV_RETURN_SKIP_INSTRUCTION;
763          
764                  // MacOS 8 serial drivers on startup
765 <                else if (pc == ROM_BASE + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
765 >                else if (pc == ROMBase + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
766                          return SIGSEGV_RETURN_SKIP_INSTRUCTION;
767          
768                  // MacOS 8.1 serial drivers on startup
769 <                else if (pc == ROM_BASE + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
769 >                else if (pc == ROMBase + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
770                          return SIGSEGV_RETURN_SKIP_INSTRUCTION;
771 <                else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
771 >                else if (pc == ROMBase + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
772                          return SIGSEGV_RETURN_SKIP_INSTRUCTION;
773          
774                  // MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM)
# Line 793 | Line 790 | sigsegv_return_t sigsegv_handler(sigsegv
790   #endif
791  
792          fprintf(stderr, "SIGSEGV\n");
793 <        fprintf(stderr, "  pc %p\n", fault_instruction);
794 <        fprintf(stderr, "  ea %p\n", fault_address);
793 >        fprintf(stderr, "  pc %p\n", sigsegv_get_fault_instruction_address(sip));
794 >        fprintf(stderr, "  ea %p\n", sigsegv_get_fault_address(sip));
795          dump_registers();
796          ppc_cpu->dump_log();
797          enter_mon();
# Line 810 | Line 807 | void init_emul_ppc(void)
807  
808          // Initialize main CPU emulator
809          ppc_cpu = new sheepshaver_cpu();
810 <        ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
810 >        ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROMBase + 0x30d000));
811          ppc_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
812          WriteMacInt32(XLM_RUN_MODE, MODE_68K);
813  
# Line 954 | Line 951 | void HandleInterrupt(powerpc_registers *
951                          // Execute nanokernel interrupt routine (this will activate the 68k emulator)
952                          DisableInterrupt();
953                          if (ROMType == ROMTYPE_NEWWORLD)
954 <                                ppc_cpu->interrupt(ROM_BASE + 0x312b1c);
954 >                                ppc_cpu->interrupt(ROMBase + 0x312b1c);
955                          else
956 <                                ppc_cpu->interrupt(ROM_BASE + 0x312a3c);
956 >                                ppc_cpu->interrupt(ROMBase + 0x312a3c);
957                  }
958                  break;
959   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines