30 |
|
# include <pthread.h> |
31 |
|
#endif |
32 |
|
|
33 |
< |
#if defined(USE_MAPPED_MEMORY) || REAL_ADDRESSING |
33 |
> |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
34 |
|
# include <sys/mman.h> |
35 |
|
#endif |
36 |
|
|
50 |
|
|
51 |
|
#ifdef ENABLE_GTK |
52 |
|
# include <gtk/gtk.h> |
53 |
+ |
# include <gdk/gdk.h> |
54 |
|
#endif |
55 |
|
|
56 |
|
#ifdef ENABLE_XF86_DGA |
109 |
|
Display *x_display = NULL; // X11 display handle |
110 |
|
|
111 |
|
static int zero_fd = -1; // FD of /dev/zero |
111 |
– |
static bool lm_area_mapped = false; // Flag: Low Memory area mmap()ped |
112 |
|
static uint8 last_xpram[256]; // Buffer for monitoring XPRAM changes |
113 |
|
|
114 |
|
#ifdef HAVE_PTHREADS |
134 |
|
static struct sigaction sigill_sa; // Illegal instruction |
135 |
|
static void *sig_stack = NULL; // Stack for signal handlers |
136 |
|
uint16 EmulatedSR; // Emulated bits of SR (supervisor bit and interrupt mask) |
137 |
< |
uint32 ScratchMem = NULL; // Scratch memory for Mac ROM writes |
137 |
> |
#endif |
138 |
> |
|
139 |
> |
#if USE_SCRATCHMEM_SUBTERFUGE |
140 |
> |
uint8 *ScratchMem = NULL; // Scratch memory for Mac ROM writes |
141 |
|
#endif |
142 |
|
|
143 |
|
static struct sigaction timer_sa; // sigaction used for timer |
152 |
|
static void sigint_handler(...); |
153 |
|
#endif |
154 |
|
|
155 |
< |
#ifdef USE_MAPPED_MEMORY |
156 |
< |
extern char *address_space, *good_address_map; |
155 |
> |
#if REAL_ADDRESSING |
156 |
> |
static bool lm_area_mapped = false; // Flag: Low Memory area mmap()ped |
157 |
> |
static bool memory_mapped_from_zero = false; // Flag: Could allocate RAM area from 0 |
158 |
> |
#endif |
159 |
> |
|
160 |
> |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
161 |
> |
static uint32 mapped_ram_rom_size; // Total size of mmap()ed RAM/ROM area |
162 |
|
#endif |
163 |
|
|
164 |
|
|
209 |
|
printf(GetString(STR_ABOUT_TEXT1), VERSION_MAJOR, VERSION_MINOR); |
210 |
|
printf(" %s\n", GetString(STR_ABOUT_TEXT2)); |
211 |
|
|
212 |
< |
// Parse arguments |
212 |
> |
#ifdef ENABLE_GTK |
213 |
> |
// Init GTK |
214 |
> |
gtk_set_locale(); |
215 |
> |
gtk_init(&argc, &argv); |
216 |
> |
x_display_name = gdk_get_display(); // gtk_init() handles and removes the "--display" argument |
217 |
> |
#endif |
218 |
> |
|
219 |
> |
// Parse and remove arguments |
220 |
|
for (int i=1; i<argc; i++) { |
221 |
< |
if (strcmp(argv[i], "-display") == 0 && ++i < argc) |
222 |
< |
x_display_name = argv[i]; |
223 |
< |
else if (strcmp(argv[i], "-break") == 0 && ++i < argc) |
224 |
< |
ROMBreakpoint = strtol(argv[i], NULL, 0); |
225 |
< |
else if (strcmp(argv[i], "-rominfo") == 0) |
221 |
> |
if (strcmp(argv[i], "--display") == 0) { |
222 |
> |
argv[i] = NULL; |
223 |
> |
if ((i + 1) < argc && argv[i + 1]) { |
224 |
> |
argv[i++] = NULL; |
225 |
> |
x_display_name = strdup(argv[i]); |
226 |
> |
} |
227 |
> |
} else if (strcmp(argv[i], "--break") == 0) { |
228 |
> |
argv[i] = NULL; |
229 |
> |
if ((i + 1) < argc && argv[i + 1]) { |
230 |
> |
argv[i++] = NULL; |
231 |
> |
ROMBreakpoint = strtol(argv[i], NULL, 0); |
232 |
> |
} |
233 |
> |
} else if (strcmp(argv[i], "--rominfo") == 0) { |
234 |
> |
argv[i] = NULL; |
235 |
|
PrintROMInfo = true; |
236 |
+ |
} |
237 |
+ |
} |
238 |
+ |
for (int i=1; i<argc; i++) { |
239 |
+ |
int k; |
240 |
+ |
for (k=i; k<argc; k++) |
241 |
+ |
if (argv[k] != NULL) |
242 |
+ |
break; |
243 |
+ |
if (k > i) { |
244 |
+ |
k -= i; |
245 |
+ |
for (int j=i+k; j<argc; j++) |
246 |
+ |
argv[j-k] = argv[j]; |
247 |
+ |
argc -= k; |
248 |
+ |
} |
249 |
|
} |
250 |
|
|
251 |
|
// Open display |
262 |
|
XF86DGAForkApp(DefaultScreen(x_display)); |
263 |
|
#endif |
264 |
|
|
228 |
– |
#ifdef ENABLE_GTK |
229 |
– |
// Init GTK |
230 |
– |
gtk_set_locale(); |
231 |
– |
gtk_init(&argc, &argv); |
232 |
– |
#endif |
233 |
– |
|
265 |
|
// Read preferences |
266 |
< |
PrefsInit(); |
266 |
> |
PrefsInit(argc, argv); |
267 |
|
|
268 |
|
// Init system routines |
269 |
|
SysInit(); |
288 |
|
RAMSize = 1024*1024; |
289 |
|
} |
290 |
|
|
291 |
+ |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
292 |
+ |
const uint32 page_size = getpagesize(); |
293 |
+ |
const uint32 page_mask = page_size - 1; |
294 |
+ |
const uint32 aligned_ram_size = (RAMSize + page_mask) & ~page_mask; |
295 |
+ |
mapped_ram_rom_size = aligned_ram_size + 0x100000; |
296 |
+ |
#endif |
297 |
+ |
|
298 |
|
#if REAL_ADDRESSING |
299 |
+ |
// Try to allocate the complete address space from zero |
300 |
+ |
// gb-- the Solaris manpage about mmap(2) states that using MAP_FIXED |
301 |
+ |
// implies undefined behaviour for further use of sbrk(), malloc(), etc. |
302 |
+ |
// cebix-- on NetBSD/m68k, this causes a segfault |
303 |
+ |
#if defined(OS_solaris) || defined(OS_netbsd) |
304 |
+ |
// Anyway, it doesn't work... |
305 |
+ |
if (0) { |
306 |
+ |
#else |
307 |
+ |
if (mmap((caddr_t)0x0000, mapped_ram_rom_size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0) != MAP_FAILED) { |
308 |
+ |
#endif |
309 |
+ |
D(bug("Could allocate RAM and ROM from 0x0000\n")); |
310 |
+ |
memory_mapped_from_zero = true; |
311 |
+ |
} |
312 |
|
// Create Low Memory area (0x0000..0x2000) |
313 |
< |
if (mmap((char *)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0) == (void *)-1) { |
313 |
> |
else if (mmap((char *)0x0000, 0x2000, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, zero_fd, 0) != MAP_FAILED) { |
314 |
> |
D(bug("Could allocate the Low Memory globals\n")); |
315 |
> |
lm_area_mapped = true; |
316 |
> |
} |
317 |
> |
// Exit on error |
318 |
> |
else { |
319 |
|
sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno)); |
320 |
|
ErrorAlert(str); |
321 |
|
QuitEmulator(); |
322 |
|
} |
267 |
– |
lm_area_mapped = true; |
323 |
|
#endif |
324 |
|
|
325 |
< |
#if !EMULATED_68K |
325 |
> |
#if USE_SCRATCHMEM_SUBTERFUGE |
326 |
|
// Allocate scratch memory |
327 |
< |
ScratchMem = (uint32)malloc(SCRATCH_MEM_SIZE); |
327 |
> |
ScratchMem = (uint8 *)malloc(SCRATCH_MEM_SIZE); |
328 |
|
if (ScratchMem == NULL) { |
329 |
|
ErrorAlert(GetString(STR_NO_MEM_ERR)); |
330 |
|
QuitEmulator(); |
333 |
|
#endif |
334 |
|
|
335 |
|
// Create areas for Mac RAM and ROM |
336 |
< |
#if defined(USE_MAPPED_MEMORY) |
337 |
< |
good_address_map = (char *)mmap(NULL, 1<<24, PROT_READ, MAP_PRIVATE, zero_fd, 0); |
338 |
< |
address_space = (char *)mmap(NULL, 1<<24, PROT_READ | PROT_WRITE, MAP_PRIVATE, zero_fd, 0); |
339 |
< |
if ((int)address_space < 0 || (int)good_address_map < 0) { |
340 |
< |
ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR)); |
341 |
< |
QuitEmulator(); |
342 |
< |
} |
343 |
< |
RAMBaseHost = (uint8 *)mmap(address_space, RAMSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, zero_fd, 0); |
344 |
< |
ROMBaseHost = (uint8 *)mmap(address_space + 0x00400000, 0x80000, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, zero_fd, 0); |
345 |
< |
char *nam = tmpnam(NULL); |
346 |
< |
int good_address_fd = open(nam, O_CREAT | O_RDWR, 0600); |
347 |
< |
char buffer[4096]; |
348 |
< |
memset(buffer, 1, sizeof(buffer)); |
349 |
< |
write(good_address_fd, buffer, sizeof(buffer)); |
350 |
< |
unlink(nam); |
351 |
< |
for (int i=0; i<RAMSize; i+=4096) |
352 |
< |
mmap(good_address_map + i, 4096, PROT_READ, MAP_FIXED | MAP_PRIVATE, good_address_fd, 0); |
353 |
< |
for (int i=0; i<0x80000; i+=4096) |
299 |
< |
mmap(good_address_map + i + 0x00400000, 4096, PROT_READ, MAP_FIXED | MAP_PRIVATE, good_address_fd, 0); |
336 |
> |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
337 |
> |
// gb-- Overkill, needs to be cleaned up. Probably explode it for either |
338 |
> |
// real or direct addressing mode. |
339 |
> |
#if REAL_ADDRESSING |
340 |
> |
if (memory_mapped_from_zero) { |
341 |
> |
RAMBaseHost = (uint8 *)0; |
342 |
> |
ROMBaseHost = RAMBaseHost + aligned_ram_size; |
343 |
> |
} |
344 |
> |
else |
345 |
> |
#endif |
346 |
> |
{ |
347 |
> |
RAMBaseHost = (uint8 *)mmap(0, mapped_ram_rom_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, zero_fd, 0); |
348 |
> |
if (RAMBaseHost == (uint8 *)MAP_FAILED) { |
349 |
> |
ErrorAlert(GetString(STR_NO_MEM_ERR)); |
350 |
> |
QuitEmulator(); |
351 |
> |
} |
352 |
> |
ROMBaseHost = RAMBaseHost + aligned_ram_size; |
353 |
> |
} |
354 |
|
#else |
355 |
< |
RAMBaseHost = new uint8[RAMSize]; |
356 |
< |
ROMBaseHost = new uint8[0x100000]; |
355 |
> |
RAMBaseHost = (uint8 *)malloc(RAMSize); |
356 |
> |
ROMBaseHost = (uint8 *)malloc(0x100000); |
357 |
> |
if (RAMBaseHost == NULL || ROMBaseHost == NULL) { |
358 |
> |
ErrorAlert(GetString(STR_NO_MEM_ERR)); |
359 |
> |
QuitEmulator(); |
360 |
> |
} |
361 |
|
#endif |
362 |
< |
#if REAL_ADDRESSING && !EMULATED_68K |
362 |
> |
|
363 |
> |
#if DIRECT_ADDRESSING |
364 |
> |
// Initialize MEMBaseDiff now so that Host2MacAddr in the Video module |
365 |
> |
// will return correct results |
366 |
> |
RAMBaseMac = 0; |
367 |
> |
ROMBaseMac = RAMBaseMac + aligned_ram_size; |
368 |
> |
InitMEMBaseDiff(RAMBaseHost, RAMBaseMac); |
369 |
> |
#endif |
370 |
> |
#if REAL_ADDRESSING // && !EMULATED_68K |
371 |
|
RAMBaseMac = (uint32)RAMBaseHost; |
372 |
|
ROMBaseMac = (uint32)ROMBaseHost; |
373 |
|
#endif |
374 |
|
D(bug("Mac RAM starts at %p (%08x)\n", RAMBaseHost, RAMBaseMac)); |
375 |
|
D(bug("Mac ROM starts at %p (%08x)\n", ROMBaseHost, ROMBaseMac)); |
376 |
< |
|
376 |
> |
|
377 |
|
// Get rom file path from preferences |
378 |
|
const char *rom_path = PrefsFindString("rom"); |
379 |
|
|
422 |
|
printf("WARNING: Cannot detect CPU type, assuming 68020\n"); |
423 |
|
CPUType = 2; |
424 |
|
} |
425 |
< |
FPUType = 0; //!! |
425 |
> |
FPUType = 1; // NetBSD has an FPU emulation, so the FPU ought to be available at all times |
426 |
|
TwentyFourBitAddressing = false; |
427 |
|
#endif |
428 |
|
|
485 |
|
#ifdef ENABLE_MON |
486 |
|
// Setup SIGINT handler to enter mon |
487 |
|
sigemptyset(&sigint_sa.sa_mask); |
488 |
< |
sigint_sa.sa_handler = sigint_handler; |
488 |
> |
sigint_sa.sa_handler = (void (*)(int))sigint_handler; |
489 |
|
sigint_sa.sa_flags = 0; |
490 |
|
sigaction(SIGINT, &sigint_sa, NULL); |
491 |
|
#endif |
494 |
|
|
495 |
|
// POSIX.4 timers and real-time signals available, start 60Hz timer |
496 |
|
sigemptyset(&timer_sa.sa_mask); |
497 |
< |
timer_sa.sa_sigaction = one_tick; |
497 |
> |
timer_sa.sa_sigaction = (void (*)(int, siginfo_t *, void *))one_tick; |
498 |
|
timer_sa.sa_flags = SA_SIGINFO | SA_RESTART; |
499 |
|
if (sigaction(SIG_TIMER, &timer_sa, NULL) < 0) { |
500 |
|
sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIG_TIMER", strerror(errno)); |
623 |
|
// Deinitialize everything |
624 |
|
ExitAll(); |
625 |
|
|
626 |
< |
// Delete ROM area |
627 |
< |
delete[] ROMBaseHost; |
628 |
< |
|
629 |
< |
// Delete RAM area |
630 |
< |
delete[] RAMBaseHost; |
626 |
> |
// Free ROM/RAM areas |
627 |
> |
#if REAL_ADDRESSING |
628 |
> |
if (memory_mapped_from_zero) |
629 |
> |
munmap((caddr_t)0x0000, mapped_ram_rom_size); |
630 |
> |
else |
631 |
> |
#endif |
632 |
> |
#if REAL_ADDRESSING || DIRECT_ADDRESSING |
633 |
> |
if (RAMBaseHost != (uint8 *)MAP_FAILED) { |
634 |
> |
munmap((caddr_t)RAMBaseHost, mapped_ram_rom_size); |
635 |
> |
RAMBaseHost = NULL; |
636 |
> |
} |
637 |
> |
#else |
638 |
> |
if (ROMBaseHost) { |
639 |
> |
free(ROMBaseHost); |
640 |
> |
ROMBaseHost = NULL; |
641 |
> |
} |
642 |
> |
if (RAMBaseHost) { |
643 |
> |
free(RAMBaseHost); |
644 |
> |
RAMBaseHost = NULL; |
645 |
> |
} |
646 |
> |
#endif |
647 |
|
|
648 |
< |
#if !EMULATED_68K |
648 |
> |
#if USE_SCRATCHMEM_SUBTERFUGE |
649 |
|
// Delete scratch memory area |
650 |
< |
if (ScratchMem) |
650 |
> |
if (ScratchMem) { |
651 |
|
free((void *)(ScratchMem - SCRATCH_MEM_SIZE/2)); |
652 |
+ |
ScratchMem = NULL; |
653 |
+ |
} |
654 |
|
#endif |
655 |
|
|
656 |
|
#if REAL_ADDRESSING |
702 |
|
extern void m68k_dumpstate(uaecptr *nextpc); |
703 |
|
m68k_dumpstate(&nextpc); |
704 |
|
#else |
705 |
< |
char *arg[2] = {"rmon", NULL}; |
706 |
< |
mon(1, arg); |
705 |
> |
char *arg[4] = {"mon", "-m", "-r", NULL}; |
706 |
> |
mon(3, arg); |
707 |
|
QuitEmulator(); |
708 |
|
#endif |
709 |
|
} |
749 |
|
raise(SIG_IRQ); |
750 |
|
#endif |
751 |
|
} |
752 |
+ |
|
753 |
+ |
void TriggerNMI(void) |
754 |
+ |
{ |
755 |
+ |
// not yet supported |
756 |
+ |
} |
757 |
|
#endif |
758 |
|
|
759 |
|
|
773 |
|
static void *xpram_func(void *arg) |
774 |
|
{ |
775 |
|
while (!xpram_thread_cancel) { |
776 |
< |
for (int i=0; i<60 && !xpram_thread_cancel; i++) { |
777 |
< |
#ifdef HAVE_NANOSLEEP |
689 |
< |
struct timespec req = {1, 0}; |
690 |
< |
nanosleep(&req, NULL); |
691 |
< |
#else |
692 |
< |
usleep(1000000); |
693 |
< |
#endif |
694 |
< |
} |
776 |
> |
for (int i=0; i<60 && !xpram_thread_cancel; i++) |
777 |
> |
Delay_usec(999999); |
778 |
|
xpram_watchdog(); |
779 |
|
} |
780 |
|
return NULL; |
791 |
|
// Pseudo Mac 1Hz interrupt, update local time |
792 |
|
WriteMacInt32(0x20c, TimerDateTime()); |
793 |
|
|
794 |
< |
SetInterruptFlag(INTFLAG_60HZ); |
794 |
> |
SetInterruptFlag(INTFLAG_1HZ); |
795 |
|
TriggerInterrupt(); |
796 |
|
|
797 |
|
#ifndef HAVE_PTHREADS |
826 |
|
#ifdef HAVE_PTHREADS |
827 |
|
static void *tick_func(void *arg) |
828 |
|
{ |
829 |
+ |
uint64 next = GetTicks_usec(); |
830 |
|
while (!tick_thread_cancel) { |
747 |
– |
|
748 |
– |
// Wait |
749 |
– |
#ifdef HAVE_NANOSLEEP |
750 |
– |
struct timespec req = {0, 16625000}; |
751 |
– |
nanosleep(&req, NULL); |
752 |
– |
#else |
753 |
– |
usleep(16625); |
754 |
– |
#endif |
755 |
– |
|
756 |
– |
// Action |
831 |
|
one_tick(); |
832 |
+ |
next += 16625; |
833 |
+ |
int64 delay = next - GetTicks_usec(); |
834 |
+ |
if (delay > 0) |
835 |
+ |
Delay_usec(delay); |
836 |
+ |
else if (delay < -16625) |
837 |
+ |
next = GetTicks_usec(); |
838 |
|
} |
839 |
|
return NULL; |
840 |
|
} |
841 |
|
#endif |
842 |
|
|
843 |
|
|
844 |
+ |
/* |
845 |
+ |
* Get current value of microsecond timer |
846 |
+ |
*/ |
847 |
+ |
|
848 |
+ |
uint64 GetTicks_usec(void) |
849 |
+ |
{ |
850 |
+ |
#ifdef HAVE_CLOCK_GETTIME |
851 |
+ |
struct timespec t; |
852 |
+ |
clock_gettime(CLOCK_REALTIME, &t); |
853 |
+ |
return (uint64)t.tv_sec * 1000000 + t.tv_nsec / 1000; |
854 |
+ |
#else |
855 |
+ |
struct timeval t; |
856 |
+ |
gettimeofday(&t, NULL); |
857 |
+ |
return (uint64)t.tv_sec * 1000000 + t.tv_usec; |
858 |
+ |
#endif |
859 |
+ |
} |
860 |
+ |
|
861 |
+ |
|
862 |
+ |
/* |
863 |
+ |
* Delay by specified number of microseconds (<1 second) |
864 |
+ |
* (adapted from SDL_Delay() source; this function is designed to provide |
865 |
+ |
* the highest accuracy possible) |
866 |
+ |
*/ |
867 |
+ |
|
868 |
+ |
#if defined(linux) |
869 |
+ |
// Linux select() changes its timeout parameter upon return to contain |
870 |
+ |
// the remaining time. Most other unixen leave it unchanged or undefined. |
871 |
+ |
#define SELECT_SETS_REMAINING |
872 |
+ |
#elif defined(__FreeBSD__) || defined(__sun__) || defined(sgi) |
873 |
+ |
#define USE_NANOSLEEP |
874 |
+ |
#endif |
875 |
+ |
|
876 |
+ |
void Delay_usec(uint32 usec) |
877 |
+ |
{ |
878 |
+ |
int was_error; |
879 |
+ |
|
880 |
+ |
#ifdef USE_NANOSLEEP |
881 |
+ |
struct timespec elapsed, tv; |
882 |
+ |
#else |
883 |
+ |
struct timeval tv; |
884 |
+ |
#ifndef SELECT_SETS_REMAINING |
885 |
+ |
uint64 then, now, elapsed; |
886 |
+ |
#endif |
887 |
+ |
#endif |
888 |
+ |
|
889 |
+ |
// Set the timeout interval - Linux only needs to do this once |
890 |
+ |
#ifdef SELECT_SETS_REMAINING |
891 |
+ |
tv.tv_sec = 0; |
892 |
+ |
tv.tv_usec = usec; |
893 |
+ |
#elif defined(USE_NANOSLEEP) |
894 |
+ |
elapsed.tv_sec = 0; |
895 |
+ |
elapsed.tv_nsec = usec * 1000; |
896 |
+ |
#else |
897 |
+ |
then = GetTicks_usec(); |
898 |
+ |
#endif |
899 |
+ |
|
900 |
+ |
do { |
901 |
+ |
errno = 0; |
902 |
+ |
#ifdef USE_NANOSLEEP |
903 |
+ |
tv.tv_sec = elapsed.tv_sec; |
904 |
+ |
tv.tv_nsec = elapsed.tv_nsec; |
905 |
+ |
was_error = nanosleep(&tv, &elapsed); |
906 |
+ |
#else |
907 |
+ |
#ifndef SELECT_SETS_REMAINING |
908 |
+ |
// Calculate the time interval left (in case of interrupt) |
909 |
+ |
now = GetTicks_usec(); |
910 |
+ |
elapsed = now - then; |
911 |
+ |
then = now; |
912 |
+ |
if (elapsed >= usec) |
913 |
+ |
break; |
914 |
+ |
usec -= elapsed; |
915 |
+ |
tv.tv_sec = 0; |
916 |
+ |
tv.tv_usec = usec; |
917 |
+ |
#endif |
918 |
+ |
was_error = select(0, NULL, NULL, NULL, &tv); |
919 |
+ |
#endif |
920 |
+ |
} while (was_error && (errno == EINTR)); |
921 |
+ |
} |
922 |
+ |
|
923 |
+ |
|
924 |
|
#if !EMULATED_68K |
925 |
|
/* |
926 |
|
* Virtual 68k interrupt handler |
971 |
|
|
972 |
|
#define STORE_SR(v) \ |
973 |
|
scp->sc_ps = (v) & 0xff; \ |
974 |
< |
EmulatedSR = (v) & 0x2700; \ |
974 |
> |
EmulatedSR = (v) & 0xe700; \ |
975 |
|
if (((v) & 0x0700) == 0 && InterruptFlags) \ |
976 |
|
TriggerInterrupt(); |
977 |
|
|
1034 |
|
case 0x007c: { // ori #xxxx,sr |
1035 |
|
uint16 sr = GET_SR | pc[1]; |
1036 |
|
scp->sc_ps = sr & 0xff; // oring bits into the sr can't enable interrupts, so we don't need to call STORE_SR |
1037 |
< |
EmulatedSR = sr & 0x2700; |
1037 |
> |
EmulatedSR = sr & 0xe700; |
1038 |
|
INC_PC(4); |
1039 |
|
break; |
1040 |
|
} |
1111 |
|
} |
1112 |
|
|
1113 |
|
case 0xf327: // fsave -(sp) |
1114 |
< |
goto ill; //!! |
1114 |
> |
if (CPUIs68060) { |
1115 |
> |
regs->a[7] -= 4; |
1116 |
> |
WriteMacInt32(regs->a[7], 0x60000000); // Idle frame |
1117 |
> |
regs->a[7] -= 4; |
1118 |
> |
WriteMacInt32(regs->a[7], 0); |
1119 |
> |
regs->a[7] -= 4; |
1120 |
> |
WriteMacInt32(regs->a[7], 0); |
1121 |
> |
} else { |
1122 |
> |
regs->a[7] -= 4; |
1123 |
> |
WriteMacInt32(regs->a[7], 0x41000000); // Idle frame |
1124 |
> |
} |
1125 |
> |
scp->sc_sp = regs->a[7]; |
1126 |
> |
INC_PC(2); |
1127 |
> |
break; |
1128 |
|
|
1129 |
|
case 0xf35f: // frestore (sp)+ |
1130 |
< |
goto ill; //!! |
1130 |
> |
if (CPUIs68060) |
1131 |
> |
regs->a[7] += 12; |
1132 |
> |
else |
1133 |
> |
regs->a[7] += 4; |
1134 |
> |
scp->sc_sp = regs->a[7]; |
1135 |
> |
INC_PC(2); |
1136 |
> |
break; |
1137 |
|
|
1138 |
< |
case 0x4e73: { // rte (only handles format 0) |
1138 |
> |
case 0x4e73: { // rte |
1139 |
|
uint32 a7 = regs->a[7]; |
1140 |
|
uint16 sr = ReadMacInt16(a7); |
1141 |
|
a7 += 2; |
1142 |
|
scp->sc_ps = sr & 0xff; |
1143 |
< |
EmulatedSR = sr & 0x2700; |
1143 |
> |
EmulatedSR = sr & 0xe700; |
1144 |
|
scp->sc_pc = ReadMacInt32(a7); |
1145 |
< |
a7 += 6; |
1146 |
< |
scp->sc_sp = regs->a[7] = a7; |
1145 |
> |
a7 += 4; |
1146 |
> |
uint16 format = ReadMacInt16(a7) >> 12; |
1147 |
> |
a7 += 2; |
1148 |
> |
static const int frame_adj[16] = { |
1149 |
> |
0, 0, 4, 4, 8, 0, 0, 52, 50, 12, 24, 84, 16, 0, 0, 0 |
1150 |
> |
}; |
1151 |
> |
scp->sc_sp = regs->a[7] = a7 + frame_adj[format]; |
1152 |
|
break; |
1153 |
|
} |
1154 |
|
|
1155 |
|
case 0x4e7a: // movec cr,x |
1156 |
|
switch (pc[1]) { |
973 |
– |
case 0x8801: // movec vbr,a0 |
974 |
– |
regs->a[0] = 0; |
975 |
– |
break; |
976 |
– |
case 0x9801: // movec vbr,a1 |
977 |
– |
regs->a[1] = 0; |
978 |
– |
break; |
1157 |
|
case 0x0002: // movec cacr,d0 |
1158 |
|
regs->d[0] = 0x3111; |
1159 |
|
break; |
1161 |
|
regs->d[1] = 0x3111; |
1162 |
|
break; |
1163 |
|
case 0x0003: // movec tc,d0 |
1164 |
+ |
case 0x0004: // movec itt0,d0 |
1165 |
+ |
case 0x0005: // movec itt1,d0 |
1166 |
+ |
case 0x0006: // movec dtt0,d0 |
1167 |
+ |
case 0x0007: // movec dtt1,d0 |
1168 |
+ |
case 0x0806: // movec urp,d0 |
1169 |
+ |
case 0x0807: // movec srp,d0 |
1170 |
|
regs->d[0] = 0; |
1171 |
|
break; |
1172 |
+ |
case 0x1000: // movec sfc,d1 |
1173 |
+ |
case 0x1001: // movec dfc,d1 |
1174 |
|
case 0x1003: // movec tc,d1 |
1175 |
+ |
case 0x1801: // movec vbr,d1 |
1176 |
|
regs->d[1] = 0; |
1177 |
|
break; |
1178 |
+ |
case 0x8801: // movec vbr,a0 |
1179 |
+ |
regs->a[0] = 0; |
1180 |
+ |
break; |
1181 |
+ |
case 0x9801: // movec vbr,a1 |
1182 |
+ |
regs->a[1] = 0; |
1183 |
+ |
break; |
1184 |
|
default: |
1185 |
|
goto ill; |
1186 |
|
} |
1189 |
|
|
1190 |
|
case 0x4e7b: // movec x,cr |
1191 |
|
switch (pc[1]) { |
1192 |
+ |
case 0x1000: // movec d1,sfc |
1193 |
+ |
case 0x1001: // movec d1,dfc |
1194 |
|
case 0x0801: // movec d0,vbr |
1195 |
+ |
case 0x1801: // movec d1,vbr |
1196 |
|
break; |
1197 |
|
case 0x0002: // movec d0,cacr |
1198 |
|
case 0x1002: // movec d1,cacr |
1227 |
|
printf(" a%d %08x\n", i, state->ss_frame.f_regs[i+8]); |
1228 |
|
|
1229 |
|
#ifdef ENABLE_MON |
1230 |
< |
char *arg[2] = {"rmon", NULL}; |
1231 |
< |
mon(1, arg); |
1230 |
> |
char *arg[4] = {"mon", "-m", "-r", NULL}; |
1231 |
> |
mon(3, arg); |
1232 |
|
#endif |
1233 |
|
QuitEmulator(); |
1234 |
|
break; |