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.62 by gbeauche, 2005-06-30T07:34:17Z 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;
# Line 177 | Line 178 | public:
178  
179          // Make sure the SIGSEGV handler can access CPU registers
180          friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
180 –
181 –        // Memory allocator returning areas aligned on 16-byte boundaries
182 –        void *operator new(size_t size);
183 –        void operator delete(void *p);
181   };
182  
186 – // Memory allocator returning sheepshaver_cpu objects aligned on 16-byte boundaries
187 – // FORMAT: [ alignment ] magic identifier, offset to malloc'ed data, sheepshaver_cpu data
188 – void *sheepshaver_cpu::operator new(size_t size)
189 – {
190 –        const int ALIGN = 16;
191 –
192 –        // Allocate enough space for sheepshaver_cpu data + signature + align pad
193 –        uint8 *ptr = (uint8 *)malloc(size + ALIGN * 2);
194 –        if (ptr == NULL)
195 –                throw std::bad_alloc();
196 –
197 –        // Align memory
198 –        int ofs = 0;
199 –        while ((((uintptr)ptr) % ALIGN) != 0)
200 –                ofs++, ptr++;
201 –
202 –        // Insert signature and offset
203 –        struct aligned_block_t {
204 –                uint32 pad[(ALIGN - 8) / 4];
205 –                uint32 signature;
206 –                uint32 offset;
207 –                uint8  data[sizeof(sheepshaver_cpu)];
208 –        };
209 –        aligned_block_t *blk = (aligned_block_t *)ptr;
210 –        blk->signature = FOURCC('S','C','P','U');
211 –        blk->offset = ofs + (&blk->data[0] - (uint8 *)blk);
212 –        assert((((uintptr)&blk->data) % ALIGN) == 0);
213 –        return &blk->data[0];
214 – }
215 –
216 – void sheepshaver_cpu::operator delete(void *p)
217 – {
218 –        uint32 *blk = (uint32 *)p;
219 –        assert(blk[-2] == FOURCC('S','C','P','U'));
220 –        void *ptr = (void *)(((uintptr)p) - blk[-1]);
221 –        free(ptr);
222 – }
223 –
183   sheepshaver_cpu::sheepshaver_cpu()
184          : powerpc_cpu(enable_jit_p())
185   {
# Line 385 | 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 868 | 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 915 | 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 935 | Line 903 | void HandleInterrupt(powerpc_registers *
903          if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
904                  return;
905  
906 <        // Do nothing if there is no pending interrupt
939 <        if (InterruptFlags == 0)
940 <                return;
941 <
942 <        // Current interrupt nest level
943 <        static int interrupt_depth = 0;
944 <        ++interrupt_depth;
906 >        // Update interrupt count
907   #if EMUL_TIME_STATS
908          interrupt_count++;
909   #endif
# Line 957 | Line 919 | void HandleInterrupt(powerpc_registers *
919   #if INTERRUPTS_IN_NATIVE_MODE
920          case MODE_NATIVE:
921                  // 68k emulator inactive, in nanokernel?
922 <                if (r->gpr[1] != KernelDataAddr && interrupt_depth == 1) {
922 >                if (r->gpr[1] != KernelDataAddr) {
923  
924                          // Prepare for 68k interrupt level 1
925                          WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
# Line 1015 | Line 977 | void HandleInterrupt(powerpc_registers *
977                  break;
978   #endif
979          }
1018 –
1019 –        // We are done with this interrupt
1020 –        --interrupt_depth;
980   }
981  
1023 – static void get_resource(void);
1024 – static void get_1_resource(void);
1025 – static void get_ind_resource(void);
1026 – static void get_1_ind_resource(void);
1027 – static void r_get_resource(void);
1028 –
982   // Execute NATIVE_OP routine
983   void sheepshaver_cpu::execute_native_op(uint32 selector)
984   {
# Line 1047 | 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 1107 | 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,
1117 <                        ::get_1_resource,
1118 <                        ::get_ind_resource,
1119 <                        ::get_1_ind_resource,
1120 <                        ::r_get_resource
1121 <                };
1122 <                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;
1124 –        }
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 1214 | 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   }
1217 –
1218 – /*
1219 – *  Resource Manager thunks
1220 – */
1221 –
1222 – void get_resource(void)
1223 – {
1224 –        ppc_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1225 – }
1226 –
1227 – void get_1_resource(void)
1228 – {
1229 –        ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1230 – }
1231 –
1232 – void get_ind_resource(void)
1233 – {
1234 –        ppc_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1235 – }
1236 –
1237 – void get_1_ind_resource(void)
1238 – {
1239 –        ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1240 – }
1241 –
1242 – void r_get_resource(void)
1243 – {
1244 –        ppc_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1245 – }

Diff Legend

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