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.57 by gbeauche, 2005-01-30T21:48:21Z vs.
Revision 1.68 by gbeauche, 2006-05-03T21:45:14Z

# Line 89 | Line 89 | extern uintptr SignalStackBase();
89  
90   // From rsrc_patches.cpp
91   extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
92 + extern "C" void named_check_load_invoc(uint32 type, uint32 name, uint32 h);
93  
94   // PowerPC EmulOp to exit from emulation looop
95   const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
96  
96 // Enable interrupt routine safety checks?
97 #define SAFE_INTERRUPT_PPC 1
98
97   // Enable Execute68k() safety checks?
98   #define SAFE_EXEC_68K 1
99  
# Line 142 | Line 140 | class sheepshaver_cpu
140          void init_decoder();
141          void execute_sheep(uint32 opcode);
142  
145        // CPU context to preserve on interrupt
146        class interrupt_context {
147                uint32 gpr[32];
148                double fpr[32];
149                uint32 pc;
150                uint32 lr;
151                uint32 ctr;
152                uint32 cr;
153                uint32 xer;
154                uint32 fpscr;
155                sheepshaver_cpu *cpu;
156                const char *where;
157        public:
158                interrupt_context(sheepshaver_cpu *_cpu, const char *_where);
159                ~interrupt_context();
160        };
161
143   public:
144  
145          // Constructor
# Line 194 | Line 175 | public:
175  
176          // Handle MacOS interrupt
177          void interrupt(uint32 entry);
197        void handle_interrupt();
178  
179          // Make sure the SIGSEGV handler can access CPU registers
180          friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
201
202        // Memory allocator returning areas aligned on 16-byte boundaries
203        void *operator new(size_t size);
204        void operator delete(void *p);
181   };
182  
207 // Memory allocator returning areas aligned on 16-byte boundaries
208 void *sheepshaver_cpu::operator new(size_t size)
209 {
210        void *p;
211
212 #if defined(HAVE_POSIX_MEMALIGN)
213        if (posix_memalign(&p, 16, size) != 0)
214                throw std::bad_alloc();
215 #elif defined(HAVE_MEMALIGN)
216        p = memalign(16, size);
217 #elif defined(HAVE_VALLOC)
218        p = valloc(size); // page-aligned!
219 #else
220        /* XXX: handle padding ourselves */
221        p = malloc(size);
222 #endif
223
224        return p;
225 }
226
227 void sheepshaver_cpu::operator delete(void *p)
228 {
229 #if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC)
230 #if defined(__GLIBC__)
231        // this is known to work only with GNU libc
232        free(p);
233 #endif
234 #else
235        free(p);
236 #endif
237 }
238
183   sheepshaver_cpu::sheepshaver_cpu()
184          : powerpc_cpu(enable_jit_p())
185   {
# Line 284 | Line 228 | void sheepshaver_cpu::execute_emul_op(ui
228          for (int i = 0; i < 7; i++)
229                  r68.a[i] = gpr(16 + i);
230          r68.a[7] = gpr(1);
231 <        uint32 saved_cr = get_cr() & CR_field<2>::mask();
231 >        uint32 saved_cr = get_cr() & 0xff9fffff; // mask_operand::compute(11, 8)
232          uint32 saved_xer = get_xer();
233          EmulOp(&r68, gpr(24), emul_op);
234          set_cr(saved_cr);
# Line 400 | Line 344 | int sheepshaver_cpu::compile1(codegen_co
344                          dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
345                          status = COMPILE_CODE_OK;
346                          break;
347 +                case NATIVE_NAMED_CHECK_LOAD_INVOC:
348 +                        dg.gen_load_T0_GPR(3);
349 +                        dg.gen_load_T1_GPR(4);
350 +                        dg.gen_load_T2_GPR(5);
351 +                        dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))named_check_load_invoc);
352 +                        status = COMPILE_CODE_OK;
353 +                        break;
354   #endif
355                  case NATIVE_BITBLT:
356                          dg.gen_load_T0_GPR(3);
# Line 479 | Line 430 | int sheepshaver_cpu::compile1(codegen_co
430   }
431   #endif
432  
482 // CPU context to preserve on interrupt
483 sheepshaver_cpu::interrupt_context::interrupt_context(sheepshaver_cpu *_cpu, const char *_where)
484 {
485 #if SAFE_INTERRUPT_PPC >= 2
486        cpu = _cpu;
487        where = _where;
488
489        // Save interrupt context
490        memcpy(&gpr[0], &cpu->gpr(0), sizeof(gpr));
491        memcpy(&fpr[0], &cpu->fpr(0), sizeof(fpr));
492        pc = cpu->pc();
493        lr = cpu->lr();
494        ctr = cpu->ctr();
495        cr = cpu->get_cr();
496        xer = cpu->get_xer();
497        fpscr = cpu->fpscr();
498 #endif
499 }
500
501 sheepshaver_cpu::interrupt_context::~interrupt_context()
502 {
503 #if SAFE_INTERRUPT_PPC >= 2
504        // Check whether CPU context was preserved by interrupt
505        if (memcmp(&gpr[0], &cpu->gpr(0), sizeof(gpr)) != 0) {
506                printf("FATAL: %s: interrupt clobbers registers\n", where);
507                for (int i = 0; i < 32; i++)
508                        if (gpr[i] != cpu->gpr(i))
509                                printf(" r%d: %08x -> %08x\n", i, gpr[i], cpu->gpr(i));
510        }
511        if (memcmp(&fpr[0], &cpu->fpr(0), sizeof(fpr)) != 0) {
512                printf("FATAL: %s: interrupt clobbers registers\n", where);
513                for (int i = 0; i < 32; i++)
514                        if (fpr[i] != cpu->fpr(i))
515                                printf(" r%d: %f -> %f\n", i, fpr[i], cpu->fpr(i));
516        }
517        if (pc != cpu->pc())
518                printf("FATAL: %s: interrupt clobbers PC\n", where);
519        if (lr != cpu->lr())
520                printf("FATAL: %s: interrupt clobbers LR\n", where);
521        if (ctr != cpu->ctr())
522                printf("FATAL: %s: interrupt clobbers CTR\n", where);
523        if (cr != cpu->get_cr())
524                printf("FATAL: %s: interrupt clobbers CR\n", where);
525        if (xer != cpu->get_xer())
526                printf("FATAL: %s: interrupt clobbers XER\n", where);
527        if (fpscr != cpu->fpscr())
528                printf("FATAL: %s: interrupt clobbers FPSCR\n", where);
529 #endif
530 }
531
433   // Handle MacOS interrupt
434   void sheepshaver_cpu::interrupt(uint32 entry)
435   {
# Line 537 | Line 438 | void sheepshaver_cpu::interrupt(uint32 e
438          const clock_t interrupt_start = clock();
439   #endif
440  
540 #if SAFE_INTERRUPT_PPC
541        static int depth = 0;
542        if (depth != 0)
543                printf("FATAL: sheepshaver_cpu::interrupt() called more than once: %d\n", depth);
544        depth++;
545 #endif
546
441          // Save program counters and branch registers
442          uint32 saved_pc = pc();
443          uint32 saved_lr = lr();
# Line 597 | Line 491 | void sheepshaver_cpu::interrupt(uint32 e
491   #if EMUL_TIME_STATS
492          interrupt_time += (clock() - interrupt_start);
493   #endif
600
601 #if SAFE_INTERRUPT_PPC
602        depth--;
603 #endif
494   }
495  
496   // Execute 68k routine
# Line 878 | Line 768 | sigsegv_return_t sigsegv_handler(sigsegv
768   #error "FIXME: You don't have the capability to skip instruction within signal handlers"
769   #endif
770  
771 <        printf("SIGSEGV\n");
772 <        printf("  pc %p\n", fault_instruction);
773 <        printf("  ea %p\n", fault_address);
771 >        fprintf(stderr, "SIGSEGV\n");
772 >        fprintf(stderr, "  pc %p\n", fault_instruction);
773 >        fprintf(stderr, "  ea %p\n", fault_address);
774          dump_registers();
775          ppc_cpu->dump_log();
776          enter_mon();
# Line 944 | Line 834 | void exit_emul_ppc(void)
834   #endif
835  
836          delete ppc_cpu;
837 +        ppc_cpu = NULL;
838   }
839  
840   #if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
# Line 991 | Line 882 | void emul_ppc(uint32 entry)
882  
883   void TriggerInterrupt(void)
884   {
885 +        idle_resume();
886   #if 0
887    WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
888   #else
# Line 1000 | Line 892 | void TriggerInterrupt(void)
892   #endif
893   }
894  
895 < void sheepshaver_cpu::handle_interrupt(void)
895 > void HandleInterrupt(powerpc_registers *r)
896   {
897   #ifdef USE_SDL_VIDEO
898          // We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
# Line 1011 | Line 903 | void sheepshaver_cpu::handle_interrupt(v
903          if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
904                  return;
905  
906 <        // Current interrupt nest level
1015 <        static int interrupt_depth = 0;
1016 <        ++interrupt_depth;
906 >        // Update interrupt count
907   #if EMUL_TIME_STATS
908          interrupt_count++;
909   #endif
910  
1021        // Disable MacOS stack sniffer
1022        WriteMacInt32(0x110, 0);
1023
911          // Interrupt action depends on current run mode
912          switch (ReadMacInt32(XLM_RUN_MODE)) {
913          case MODE_68K:
914                  // 68k emulator active, trigger 68k interrupt level 1
915                  WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
916 <                set_cr(get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
916 >                r->cr.set(r->cr.get() | tswap32(kernel_data->v[0x674 >> 2]));
917                  break;
918      
919   #if INTERRUPTS_IN_NATIVE_MODE
920          case MODE_NATIVE:
921                  // 68k emulator inactive, in nanokernel?
922 <                if (gpr(1) != KernelDataAddr && interrupt_depth == 1) {
1036 <                        interrupt_context ctx(this, "PowerPC mode");
922 >                if (r->gpr[1] != KernelDataAddr) {
923  
924                          // Prepare for 68k interrupt level 1
925                          WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
# Line 1055 | Line 941 | void sheepshaver_cpu::handle_interrupt(v
941          case MODE_EMUL_OP:
942                  // 68k emulator active, within EMUL_OP routine, execute 68k interrupt routine directly when interrupt level is 0
943                  if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
1058                        interrupt_context ctx(this, "68k mode");
944   #if EMUL_TIME_STATS
945                          const clock_t interrupt_start = clock();
946   #endif
# Line 1092 | Line 977 | void sheepshaver_cpu::handle_interrupt(v
977                  break;
978   #endif
979          }
1095
1096        // We are done with this interrupt
1097        --interrupt_depth;
980   }
981  
1100 static void get_resource(void);
1101 static void get_1_resource(void);
1102 static void get_ind_resource(void);
1103 static void get_1_ind_resource(void);
1104 static void r_get_resource(void);
1105
982   // Execute NATIVE_OP routine
983   void sheepshaver_cpu::execute_native_op(uint32 selector)
984   {
# Line 1124 | Line 1000 | void sheepshaver_cpu::execute_native_op(
1000          case NATIVE_VIDEO_DO_DRIVER_IO:
1001                  gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7));
1002                  break;
1003 +        case NATIVE_ETHER_AO_GET_HWADDR:
1004 +                AO_get_ethernet_address(gpr(3));
1005 +                break;
1006 +        case NATIVE_ETHER_AO_ADD_MULTI:
1007 +                AO_enable_multicast(gpr(3));
1008 +                break;
1009 +        case NATIVE_ETHER_AO_DEL_MULTI:
1010 +                AO_disable_multicast(gpr(3));
1011 +                break;
1012 +        case NATIVE_ETHER_AO_SEND_PACKET:
1013 +                AO_transmit_packet(gpr(3));
1014 +                break;
1015          case NATIVE_ETHER_IRQ:
1016                  EtherIRQ();
1017                  break;
# Line 1184 | Line 1072 | void sheepshaver_cpu::execute_native_op(
1072                  break;
1073          }
1074          case NATIVE_GET_RESOURCE:
1075 +                get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1076 +                break;
1077          case NATIVE_GET_1_RESOURCE:
1078 +                get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1079 +                break;
1080          case NATIVE_GET_IND_RESOURCE:
1081 +                get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1082 +                break;
1083          case NATIVE_GET_1_IND_RESOURCE:
1084 <        case NATIVE_R_GET_RESOURCE: {
1085 <                typedef void (*GetResourceCallback)(void);
1086 <                static const GetResourceCallback get_resource_callbacks[] = {
1087 <                        ::get_resource,
1194 <                        ::get_1_resource,
1195 <                        ::get_ind_resource,
1196 <                        ::get_1_ind_resource,
1197 <                        ::r_get_resource
1198 <                };
1199 <                get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1084 >                get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1085 >                break;
1086 >        case NATIVE_R_GET_RESOURCE:
1087 >                get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1088                  break;
1201        }
1089          case NATIVE_MAKE_EXECUTABLE:
1090                  MakeExecutable(0, gpr(4), gpr(5));
1091                  break;
1092          case NATIVE_CHECK_LOAD_INVOC:
1093                  check_load_invoc(gpr(3), gpr(4), gpr(5));
1094                  break;
1095 +        case NATIVE_NAMED_CHECK_LOAD_INVOC:
1096 +                named_check_load_invoc(gpr(3), gpr(4), gpr(5));
1097 +                break;
1098          default:
1099                  printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
1100                  QuitEmulator();
# Line 1291 | Line 1181 | uint32 call_macos7(uint32 tvect, uint32
1181          const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7 };
1182          return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1183   }
1294
1295 /*
1296 *  Resource Manager thunks
1297 */
1298
1299 void get_resource(void)
1300 {
1301        ppc_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1302 }
1303
1304 void get_1_resource(void)
1305 {
1306        ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1307 }
1308
1309 void get_ind_resource(void)
1310 {
1311        ppc_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1312 }
1313
1314 void get_1_ind_resource(void)
1315 {
1316        ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1317 }
1318
1319 void r_get_resource(void)
1320 {
1321        ppc_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1322 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines