| 183 |
|
void operator delete(void *p); |
| 184 |
|
}; |
| 185 |
|
|
| 186 |
< |
// Memory allocator returning areas aligned on 16-byte boundaries |
| 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 |
< |
void *p; |
| 190 |
> |
const int ALIGN = 16; |
| 191 |
|
|
| 192 |
< |
#if defined(HAVE_POSIX_MEMALIGN) |
| 193 |
< |
if (posix_memalign(&p, 16, size) != 0) |
| 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(); |
| 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 |
| 196 |
|
|
| 197 |
< |
return p; |
| 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 |
< |
#if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC) |
| 219 |
< |
#if defined(__GLIBC__) |
| 220 |
< |
// this is known to work only with GNU libc |
| 221 |
< |
free(p); |
| 212 |
< |
#endif |
| 213 |
< |
#else |
| 214 |
< |
free(p); |
| 215 |
< |
#endif |
| 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 |
|
|
| 224 |
|
sheepshaver_cpu::sheepshaver_cpu() |
| 269 |
|
for (int i = 0; i < 7; i++) |
| 270 |
|
r68.a[i] = gpr(16 + i); |
| 271 |
|
r68.a[7] = gpr(1); |
| 272 |
< |
uint32 saved_cr = get_cr() & CR_field<2>::mask(); |
| 272 |
> |
uint32 saved_cr = get_cr() & 0xff9fffff; // mask_operand::compute(11, 8) |
| 273 |
|
uint32 saved_xer = get_xer(); |
| 274 |
|
EmulOp(&r68, gpr(24), emul_op); |
| 275 |
|
set_cr(saved_cr); |
| 802 |
|
#error "FIXME: You don't have the capability to skip instruction within signal handlers" |
| 803 |
|
#endif |
| 804 |
|
|
| 805 |
< |
printf("SIGSEGV\n"); |
| 806 |
< |
printf(" pc %p\n", fault_instruction); |
| 807 |
< |
printf(" ea %p\n", fault_address); |
| 805 |
> |
fprintf(stderr, "SIGSEGV\n"); |
| 806 |
> |
fprintf(stderr, " pc %p\n", fault_instruction); |
| 807 |
> |
fprintf(stderr, " ea %p\n", fault_address); |
| 808 |
|
dump_registers(); |
| 809 |
|
ppc_cpu->dump_log(); |
| 810 |
|
enter_mon(); |
| 935 |
|
if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0) |
| 936 |
|
return; |
| 937 |
|
|
| 938 |
< |
// Increment interrupt counter |
| 938 |
> |
// 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; |
| 945 |
|
#if EMUL_TIME_STATS |
| 946 |
|
interrupt_count++; |
| 947 |
|
#endif |
| 957 |
|
#if INTERRUPTS_IN_NATIVE_MODE |
| 958 |
|
case MODE_NATIVE: |
| 959 |
|
// 68k emulator inactive, in nanokernel? |
| 960 |
< |
if (r->gpr[1] != KernelDataAddr) { |
| 960 |
> |
if (r->gpr[1] != KernelDataAddr && interrupt_depth == 1) { |
| 961 |
|
|
| 962 |
|
// Prepare for 68k interrupt level 1 |
| 963 |
|
WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1); |
| 1015 |
|
break; |
| 1016 |
|
#endif |
| 1017 |
|
} |
| 1018 |
+ |
|
| 1019 |
+ |
// We are done with this interrupt |
| 1020 |
+ |
--interrupt_depth; |
| 1021 |
|
} |
| 1022 |
|
|
| 1023 |
|
static void get_resource(void); |
