177 |
|
|
178 |
|
// Make sure the SIGSEGV handler can access CPU registers |
179 |
|
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); |
180 |
|
}; |
181 |
|
|
186 |
– |
// Memory allocator returning areas aligned on 16-byte boundaries |
187 |
– |
void *sheepshaver_cpu::operator new(size_t size) |
188 |
– |
{ |
189 |
– |
void *p; |
190 |
– |
|
191 |
– |
#if defined(HAVE_POSIX_MEMALIGN) |
192 |
– |
if (posix_memalign(&p, 16, size) != 0) |
193 |
– |
throw std::bad_alloc(); |
194 |
– |
#elif defined(HAVE_MEMALIGN) |
195 |
– |
p = memalign(16, size); |
196 |
– |
#elif defined(HAVE_VALLOC) |
197 |
– |
p = valloc(size); // page-aligned! |
198 |
– |
#else |
199 |
– |
/* XXX: handle padding ourselves */ |
200 |
– |
p = malloc(size); |
201 |
– |
#endif |
202 |
– |
|
203 |
– |
return p; |
204 |
– |
} |
205 |
– |
|
206 |
– |
void sheepshaver_cpu::operator delete(void *p) |
207 |
– |
{ |
208 |
– |
#if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC) |
209 |
– |
#if defined(__GLIBC__) |
210 |
– |
// this is known to work only with GNU libc |
211 |
– |
free(p); |
212 |
– |
#endif |
213 |
– |
#else |
214 |
– |
free(p); |
215 |
– |
#endif |
216 |
– |
} |
217 |
– |
|
182 |
|
sheepshaver_cpu::sheepshaver_cpu() |
183 |
|
: powerpc_cpu(enable_jit_p()) |
184 |
|
{ |
227 |
|
for (int i = 0; i < 7; i++) |
228 |
|
r68.a[i] = gpr(16 + i); |
229 |
|
r68.a[7] = gpr(1); |
230 |
< |
uint32 saved_cr = get_cr() & CR_field<2>::mask(); |
230 |
> |
uint32 saved_cr = get_cr() & 0xff9fffff; // mask_operand::compute(11, 8) |
231 |
|
uint32 saved_xer = get_xer(); |
232 |
|
EmulOp(&r68, gpr(24), emul_op); |
233 |
|
set_cr(saved_cr); |
760 |
|
#error "FIXME: You don't have the capability to skip instruction within signal handlers" |
761 |
|
#endif |
762 |
|
|
763 |
< |
printf("SIGSEGV\n"); |
764 |
< |
printf(" pc %p\n", fault_instruction); |
765 |
< |
printf(" ea %p\n", fault_address); |
763 |
> |
fprintf(stderr, "SIGSEGV\n"); |
764 |
> |
fprintf(stderr, " pc %p\n", fault_instruction); |
765 |
> |
fprintf(stderr, " ea %p\n", fault_address); |
766 |
|
dump_registers(); |
767 |
|
ppc_cpu->dump_log(); |
768 |
|
enter_mon(); |
826 |
|
#endif |
827 |
|
|
828 |
|
delete ppc_cpu; |
829 |
+ |
ppc_cpu = NULL; |
830 |
|
} |
831 |
|
|
832 |
|
#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT |
874 |
|
|
875 |
|
void TriggerInterrupt(void) |
876 |
|
{ |
877 |
+ |
idle_resume(); |
878 |
|
#if 0 |
879 |
|
WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1); |
880 |
|
#else |
895 |
|
if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0) |
896 |
|
return; |
897 |
|
|
898 |
< |
// Do nothing if there is no pending interrupt |
933 |
< |
if (InterruptFlags == 0) |
934 |
< |
return; |
935 |
< |
|
936 |
< |
// Current interrupt nest level |
937 |
< |
static int interrupt_depth = 0; |
938 |
< |
++interrupt_depth; |
898 |
> |
// Update interrupt count |
899 |
|
#if EMUL_TIME_STATS |
900 |
|
interrupt_count++; |
901 |
|
#endif |
911 |
|
#if INTERRUPTS_IN_NATIVE_MODE |
912 |
|
case MODE_NATIVE: |
913 |
|
// 68k emulator inactive, in nanokernel? |
914 |
< |
if (r->gpr[1] != KernelDataAddr && interrupt_depth == 1) { |
914 |
> |
if (r->gpr[1] != KernelDataAddr) { |
915 |
|
|
916 |
|
// Prepare for 68k interrupt level 1 |
917 |
|
WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1); |
969 |
|
break; |
970 |
|
#endif |
971 |
|
} |
1012 |
– |
|
1013 |
– |
// We are done with this interrupt |
1014 |
– |
--interrupt_depth; |
972 |
|
} |
973 |
|
|
974 |
|
static void get_resource(void); |
998 |
|
case NATIVE_VIDEO_DO_DRIVER_IO: |
999 |
|
gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7)); |
1000 |
|
break; |
1001 |
+ |
case NATIVE_ETHER_AO_GET_HWADDR: |
1002 |
+ |
AO_get_ethernet_address(gpr(3)); |
1003 |
+ |
break; |
1004 |
+ |
case NATIVE_ETHER_AO_ADD_MULTI: |
1005 |
+ |
AO_enable_multicast(gpr(3)); |
1006 |
+ |
break; |
1007 |
+ |
case NATIVE_ETHER_AO_DEL_MULTI: |
1008 |
+ |
AO_disable_multicast(gpr(3)); |
1009 |
+ |
break; |
1010 |
+ |
case NATIVE_ETHER_AO_SEND_PACKET: |
1011 |
+ |
AO_transmit_packet(gpr(3)); |
1012 |
+ |
break; |
1013 |
|
case NATIVE_ETHER_IRQ: |
1014 |
|
EtherIRQ(); |
1015 |
|
break; |