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.10 by gbeauche, 2003-10-26T13:59:03Z vs.
Revision 1.24 by gbeauche, 2003-12-25T23:54:36Z

# Line 28 | Line 28
28   #include "macos_util.h"
29   #include "block-alloc.hpp"
30   #include "sigsegv.h"
31 #include "spcflags.h"
31   #include "cpu/ppc/ppc-cpu.hpp"
32   #include "cpu/ppc/ppc-operations.hpp"
33 + #include "cpu/ppc/ppc-instructions.hpp"
34 + #include "thunks.h"
35  
36   // Used for NativeOp trampolines
37   #include "video.h"
38   #include "name_registry.h"
39   #include "serial.h"
40 + #include "ether.h"
41  
42   #include <stdio.h>
43  
# Line 47 | Line 49
49   #define DEBUG 0
50   #include "debug.h"
51  
52 + // Emulation time statistics
53 + #define EMUL_TIME_STATS 1
54 +
55 + #if EMUL_TIME_STATS
56 + static clock_t emul_start_time;
57 + static uint32 interrupt_count = 0;
58 + static clock_t interrupt_time = 0;
59 + static uint32 exec68k_count = 0;
60 + static clock_t exec68k_time = 0;
61 + static uint32 native_exec_count = 0;
62 + static clock_t native_exec_time = 0;
63 + static uint32 macos_exec_count = 0;
64 + static clock_t macos_exec_time = 0;
65 + #endif
66 +
67   static void enter_mon(void)
68   {
69          // Start up mon in real-mode
# Line 56 | Line 73 | static void enter_mon(void)
73   #endif
74   }
75  
76 + // From main_*.cpp
77 + extern uintptr SignalStackBase();
78 +
79 + // PowerPC EmulOp to exit from emulation looop
80 + const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
81 +
82   // Enable multicore (main/interrupts) cpu emulation?
83   #define MULTICORE_CPU (ASYNC_IRQ ? 1 : 0)
84  
# Line 74 | Line 97 | static void enter_mon(void)
97   // Pointer to Kernel Data
98   static KernelData * const kernel_data = (KernelData *)KERNEL_DATA_BASE;
99  
100 + // SIGSEGV handler
101 + static sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
102 +
103 + // JIT Compiler enabled?
104 + static inline bool enable_jit_p()
105 + {
106 +        return PrefsFindBool("jit");
107 + }
108 +
109  
110   /**
111   *              PowerPC emulator glue with special 'sheep' opcodes
112   **/
113  
114 < struct sheepshaver_exec_return { };
114 > enum {
115 >        PPC_I(SHEEP) = PPC_I(MAX),
116 >        PPC_I(SHEEP_MAX)
117 > };
118  
119   class sheepshaver_cpu
120          : public powerpc_cpu
# Line 92 | Line 127 | public:
127          // Constructor
128          sheepshaver_cpu();
129  
130 <        // Condition Register accessors
130 >        // CR & XER accessors
131          uint32 get_cr() const           { return cr().get(); }
132          void set_cr(uint32 v)           { cr().set(v); }
133 <
134 <        // Execution loop
100 <        void execute(uint32 entry, bool enable_cache = false);
133 >        uint32 get_xer() const          { return xer().get(); }
134 >        void set_xer(uint32 v)          { xer().set(v); }
135  
136          // Execute 68k routine
137          void execute_68k(uint32 entry, M68kRegisters *r);
# Line 115 | Line 149 | public:
149          void interrupt(uint32 entry);
150          void handle_interrupt();
151  
118        // spcflags for interrupts handling
119        static uint32 spcflags;
120
152          // Lazy memory allocator (one item at a time)
153          void *operator new(size_t size)
154                  { return allocator_helper< sheepshaver_cpu, lazy_allocator >::allocate(); }
# Line 126 | Line 157 | public:
157          // FIXME: really make surre array allocation fail at link time?
158          void *operator new[](size_t);
159          void operator delete[](void *p);
160 +
161 +        // Make sure the SIGSEGV handler can access CPU registers
162 +        friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
163   };
164  
131 uint32 sheepshaver_cpu::spcflags = 0;
165   lazy_allocator< sheepshaver_cpu > allocator_helper< sheepshaver_cpu, lazy_allocator >::allocator;
166  
167   sheepshaver_cpu::sheepshaver_cpu()
168 <        : powerpc_cpu()
168 >        : powerpc_cpu(enable_jit_p())
169   {
170          init_decoder();
171   }
# Line 148 | Line 181 | void sheepshaver_cpu::init_decoder()
181  
182          static const instr_info_t sheep_ii_table[] = {
183                  { "sheep",
184 <                  (execute_fn)&sheepshaver_cpu::execute_sheep,
184 >                  (execute_pmf)&sheepshaver_cpu::execute_sheep,
185                    NULL,
186 +                  PPC_I(SHEEP),
187                    D_form, 6, 0, CFLOW_JUMP | CFLOW_TRAP
188                  }
189          };
# Line 189 | Line 223 | void sheepshaver_cpu::execute_sheep(uint
223                  break;
224  
225          case 1:         // EXEC_RETURN
226 <                throw sheepshaver_exec_return();
226 >                spcflags().set(SPCFLAG_CPU_EXEC_RETURN);
227                  break;
228  
229          case 2:         // EXEC_NATIVE
# Line 209 | Line 243 | void sheepshaver_cpu::execute_sheep(uint
243                  for (int i = 0; i < 7; i++)
244                          r68.a[i] = gpr(16 + i);
245                  r68.a[7] = gpr(1);
246 +                uint32 saved_cr = get_cr() & CR_field<2>::mask();
247 +                uint32 saved_xer = get_xer();
248                  EmulOp(&r68, gpr(24), EMUL_OP_field::extract(opcode) - 3);
249 +                set_cr(saved_cr);
250 +                set_xer(saved_xer);
251                  for (int i = 0; i < 8; i++)
252                          gpr(8 + i) = r68.d[i];
253                  for (int i = 0; i < 7; i++)
# Line 222 | Line 260 | void sheepshaver_cpu::execute_sheep(uint
260          }
261   }
262  
225 // Execution loop
226 void sheepshaver_cpu::execute(uint32 entry, bool enable_cache)
227 {
228        try {
229                powerpc_cpu::execute(entry, enable_cache);
230        }
231        catch (sheepshaver_exec_return const &) {
232                // Nothing, simply return
233        }
234        catch (...) {
235                printf("ERROR: execute() received an unknown exception!\n");
236                QuitEmulator();
237        }
238 }
239
263   // Handle MacOS interrupt
264   void sheepshaver_cpu::interrupt(uint32 entry)
265   {
266 + #if EMUL_TIME_STATS
267 +        interrupt_count++;
268 +        const clock_t interrupt_start = clock();
269 + #endif
270 +
271   #if !MULTICORE_CPU
272          // Save program counters and branch registers
273          uint32 saved_pc = pc();
# Line 249 | Line 277 | void sheepshaver_cpu::interrupt(uint32 e
277   #endif
278  
279          // Initialize stack pointer to SheepShaver alternate stack base
280 <        gpr(1) = SheepStack1Base - 64;
280 >        gpr(1) = SignalStackBase() - 64;
281  
282          // Build trampoline to return from interrupt
283 <        uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
283 >        SheepVar32 trampoline = POWERPC_EXEC_RETURN;
284  
285          // Prepare registers for nanokernel interrupt routine
286          kernel_data->v[0x004 >> 2] = htonl(gpr(1));
# Line 271 | Line 299 | void sheepshaver_cpu::interrupt(uint32 e
299          gpr(1)  = KernelDataAddr;
300          gpr(7)  = ntohl(kernel_data->v[0x660 >> 2]);
301          gpr(8)  = 0;
302 <        gpr(10) = (uint32)trampoline;
303 <        gpr(12) = (uint32)trampoline;
302 >        gpr(10) = trampoline.addr();
303 >        gpr(12) = trampoline.addr();
304          gpr(13) = get_cr();
305  
306          // rlwimi. r7,r7,8,0,0
# Line 293 | Line 321 | void sheepshaver_cpu::interrupt(uint32 e
321          ctr()= saved_ctr;
322          gpr(1) = saved_sp;
323   #endif
324 +
325 + #if EMUL_TIME_STATS
326 +        interrupt_time += (clock() - interrupt_start);
327 + #endif
328   }
329  
330   // Execute 68k routine
331   void sheepshaver_cpu::execute_68k(uint32 entry, M68kRegisters *r)
332   {
333 + #if EMUL_TIME_STATS
334 +        exec68k_count++;
335 +        const clock_t exec68k_start = clock();
336 + #endif
337 +
338   #if SAFE_EXEC_68K
339          if (ReadMacInt32(XLM_RUN_MODE) != MODE_EMUL_OP)
340                  printf("FATAL: Execute68k() not called from EMUL_OP mode\n");
# Line 380 | Line 417 | void sheepshaver_cpu::execute_68k(uint32
417          lr() = saved_lr;
418          ctr()= saved_ctr;
419          set_cr(saved_cr);
420 +
421 + #if EMUL_TIME_STATS
422 +        exec68k_time += (clock() - exec68k_start);
423 + #endif
424   }
425  
426   // Call MacOS PPC code
427   uint32 sheepshaver_cpu::execute_macos_code(uint32 tvect, int nargs, uint32 const *args)
428   {
429 + #if EMUL_TIME_STATS
430 +        macos_exec_count++;
431 +        const clock_t macos_exec_start = clock();
432 + #endif
433 +
434          // Save program counters and branch registers
435          uint32 saved_pc = pc();
436          uint32 saved_lr = lr();
437          uint32 saved_ctr= ctr();
438  
439          // Build trampoline with EXEC_RETURN
440 <        uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
441 <        lr() = (uint32)trampoline;
440 >        SheepVar32 trampoline = POWERPC_EXEC_RETURN;
441 >        lr() = trampoline.addr();
442  
443          gpr(1) -= 64;                                                           // Create stack frame
444          uint32 proc = ReadMacInt32(tvect);                      // Get routine address
# Line 423 | Line 469 | uint32 sheepshaver_cpu::execute_macos_co
469          lr() = saved_lr;
470          ctr()= saved_ctr;
471  
472 + #if EMUL_TIME_STATS
473 +        macos_exec_time += (clock() - macos_exec_start);
474 + #endif
475 +
476          return retval;
477   }
478  
# Line 432 | Line 482 | inline void sheepshaver_cpu::execute_ppc
482          // Save branch registers
483          uint32 saved_lr = lr();
484  
485 <        const uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
486 <        lr() = (uint32)trampoline;
485 >        SheepVar32 trampoline = POWERPC_EXEC_RETURN;
486 >        WriteMacInt32(trampoline.addr(), POWERPC_EXEC_RETURN);
487 >        lr() = trampoline.addr();
488  
489          execute(entry);
490  
# Line 527 | Line 578 | static sigsegv_return_t sigsegv_handler(
578          if ((addr - ROM_BASE) < ROM_SIZE)
579                  return SIGSEGV_RETURN_SKIP_INSTRUCTION;
580  
581 <        // Ignore all other faults, if requested
582 <        if (PrefsFindBool("ignoresegv"))
583 <                return SIGSEGV_RETURN_FAILURE;
581 >        // Get program counter of target CPU
582 >        sheepshaver_cpu * const cpu = current_cpu;
583 >        const uint32 pc = cpu->pc();
584 >        
585 >        // Fault in Mac ROM or RAM?
586 >        bool mac_fault = (pc >= ROM_BASE) && (pc < (ROM_BASE + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize));
587 >        if (mac_fault) {
588 >
589 >                // "VM settings" during MacOS 8 installation
590 >                if (pc == ROM_BASE + 0x488160 && cpu->gpr(20) == 0xf8000000)
591 >                        return SIGSEGV_RETURN_SKIP_INSTRUCTION;
592 >        
593 >                // MacOS 8.5 installation
594 >                else if (pc == ROM_BASE + 0x488140 && cpu->gpr(16) == 0xf8000000)
595 >                        return SIGSEGV_RETURN_SKIP_INSTRUCTION;
596 >        
597 >                // MacOS 8 serial drivers on startup
598 >                else if (pc == ROM_BASE + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
599 >                        return SIGSEGV_RETURN_SKIP_INSTRUCTION;
600 >        
601 >                // MacOS 8.1 serial drivers on startup
602 >                else if (pc == ROM_BASE + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
603 >                        return SIGSEGV_RETURN_SKIP_INSTRUCTION;
604 >                else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
605 >                        return SIGSEGV_RETURN_SKIP_INSTRUCTION;
606 >
607 >                // Ignore all other faults, if requested
608 >                if (PrefsFindBool("ignoresegv"))
609 >                        return SIGSEGV_RETURN_SKIP_INSTRUCTION;
610 >        }
611   #else
612   #error "FIXME: You don't have the capability to skip instruction within signal handlers"
613   #endif
# Line 551 | Line 629 | void init_emul_ppc(void)
629          // Initialize main CPU emulator
630          main_cpu = new sheepshaver_cpu();
631          main_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
632 +        main_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
633          WriteMacInt32(XLM_RUN_MODE, MODE_68K);
634  
635   #if MULTICORE_CPU
# Line 566 | Line 645 | void init_emul_ppc(void)
645          mon_add_command("regs", dump_registers, "regs                     Dump PowerPC registers\n");
646          mon_add_command("log", dump_log, "log                      Dump PowerPC emulation log\n");
647   #endif
648 +
649 + #if EMUL_TIME_STATS
650 +        emul_start_time = clock();
651 + #endif
652 + }
653 +
654 + /*
655 + *  Deinitialize emulation
656 + */
657 +
658 + void exit_emul_ppc(void)
659 + {
660 + #if EMUL_TIME_STATS
661 +        clock_t emul_end_time = clock();
662 +
663 +        printf("### Statistics for SheepShaver emulation parts\n");
664 +        const clock_t emul_time = emul_end_time - emul_start_time;
665 +        printf("Total emulation time : %.1f sec\n", double(emul_time) / double(CLOCKS_PER_SEC));
666 +        printf("Total interrupt count: %d (%2.1f Hz)\n", interrupt_count,
667 +                   (double(interrupt_count) * CLOCKS_PER_SEC) / double(emul_time));
668 +
669 + #define PRINT_STATS(LABEL, VAR_PREFIX) do {                                                             \
670 +                printf("Total " LABEL " count : %d\n", VAR_PREFIX##_count);             \
671 +                printf("Total " LABEL " time  : %.1f sec (%.1f%%)\n",                   \
672 +                           double(VAR_PREFIX##_time) / double(CLOCKS_PER_SEC),          \
673 +                           100.0 * double(VAR_PREFIX##_time) / double(emul_time));      \
674 +        } while (0)
675 +
676 +        PRINT_STATS("Execute68k[Trap] execution", exec68k);
677 +        PRINT_STATS("NativeOp execution", native_exec);
678 +        PRINT_STATS("MacOS routine execution", macos_exec);
679 +
680 + #undef PRINT_STATS
681 +        printf("\n");
682 + #endif
683 +
684 +        delete main_cpu;
685 + #if MULTICORE_CPU
686 +        delete interrupt_cpu;
687 + #endif
688   }
689  
690   /*
# Line 575 | Line 694 | void init_emul_ppc(void)
694   void emul_ppc(uint32 entry)
695   {
696          current_cpu = main_cpu;
697 < #if DEBUG
697 > #if 0
698          current_cpu->start_log();
699   #endif
700          // start emulation loop and enable code translation or caching
701 <        current_cpu->execute(entry, true);
701 >        current_cpu->execute(entry);
702   }
703  
704   /*
705   *  Handle PowerPC interrupt
706   */
707  
708 < #if !ASYNC_IRQ
708 > #if ASYNC_IRQ
709 > void HandleInterrupt(void)
710 > {
711 >        main_cpu->handle_interrupt();
712 > }
713 > #else
714   void TriggerInterrupt(void)
715   {
716   #if 0
# Line 602 | Line 726 | void TriggerInterrupt(void)
726   void sheepshaver_cpu::handle_interrupt(void)
727   {
728          // Do nothing if interrupts are disabled
729 <        if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
729 >        if (*(int32 *)XLM_IRQ_NEST > 0)
730                  return;
731  
732          // Do nothing if there is no interrupt pending
# Line 669 | Line 793 | void sheepshaver_cpu::handle_interrupt(v
793                                  if (InterruptFlags & INTFLAG_VIA) {
794                                          ClearInterruptFlag(INTFLAG_VIA);
795                                          ADBInterrupt();
796 <                                        ExecutePPC(VideoVBL);
796 >                                        ExecuteNative(NATIVE_VIDEO_VBL);
797                                  }
798                          }
799   #endif
# Line 679 | Line 803 | void sheepshaver_cpu::handle_interrupt(v
803          }
804   }
805  
682 /*
683 *  Execute NATIVE_OP opcode (called by PowerPC emulator)
684 */
685
686 #define POWERPC_NATIVE_OP_INIT(LR, OP) \
687                tswap32(POWERPC_EMUL_OP | ((LR) << 11) | (((uint32)OP) << 6) | 2)
688
689 // FIXME: Make sure 32-bit relocations are used
690 const uint32 NativeOpTable[NATIVE_OP_MAX] = {
691        POWERPC_NATIVE_OP_INIT(1, NATIVE_PATCH_NAME_REGISTRY),
692        POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_INSTALL_ACCEL),
693        POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_VBL),
694        POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_DO_DRIVER_IO),
695        POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_IRQ),
696        POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_INIT),
697        POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_TERM),
698        POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_OPEN),
699        POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_CLOSE),
700        POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_WPUT),
701        POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_RSRV),
702        POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_NOTHING),
703        POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_OPEN),
704        POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_PRIME_IN),
705        POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_PRIME_OUT),
706        POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_CONTROL),
707        POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_STATUS),
708        POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_CLOSE),
709        POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_RESOURCE),
710        POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_1_RESOURCE),
711        POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_IND_RESOURCE),
712        POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_1_IND_RESOURCE),
713        POWERPC_NATIVE_OP_INIT(1, NATIVE_R_GET_RESOURCE),
714        POWERPC_NATIVE_OP_INIT(0, NATIVE_DISABLE_INTERRUPT),
715        POWERPC_NATIVE_OP_INIT(0, NATIVE_ENABLE_INTERRUPT),
716        POWERPC_NATIVE_OP_INIT(1, NATIVE_MAKE_EXECUTABLE),
717 };
718
806   static void get_resource(void);
807   static void get_1_resource(void);
808   static void get_ind_resource(void);
# Line 726 | Line 813 | static void r_get_resource(void);
813  
814   static void NativeOp(int selector)
815   {
816 + #if EMUL_TIME_STATS
817 +        native_exec_count++;
818 +        const clock_t native_exec_start = clock();
819 + #endif
820 +
821          switch (selector) {
822          case NATIVE_PATCH_NAME_REGISTRY:
823                  DoPatchNameRegistry();
# Line 740 | Line 832 | static void NativeOp(int selector)
832                  GPR(3) = (int32)(int16)VideoDoDriverIO((void *)GPR(3), (void *)GPR(4),
833                                                                                             (void *)GPR(5), GPR(6), GPR(7));
834                  break;
835 <        case NATIVE_GET_RESOURCE:
836 <                get_resource();
835 > #ifdef WORDS_BIGENDIAN
836 >        case NATIVE_ETHER_IRQ:
837 >                EtherIRQ();
838                  break;
839 <        case NATIVE_GET_1_RESOURCE:
840 <                get_1_resource();
839 >        case NATIVE_ETHER_INIT:
840 >                GPR(3) = InitStreamModule((void *)GPR(3));
841                  break;
842 <        case NATIVE_GET_IND_RESOURCE:
843 <                get_ind_resource();
842 >        case NATIVE_ETHER_TERM:
843 >                TerminateStreamModule();
844                  break;
845 <        case NATIVE_GET_1_IND_RESOURCE:
846 <                get_1_ind_resource();
845 >        case NATIVE_ETHER_OPEN:
846 >                GPR(3) = ether_open((queue_t *)GPR(3), (void *)GPR(4), GPR(5), GPR(6), (void*)GPR(7));
847                  break;
848 <        case NATIVE_R_GET_RESOURCE:
849 <                r_get_resource();
848 >        case NATIVE_ETHER_CLOSE:
849 >                GPR(3) = ether_close((queue_t *)GPR(3), GPR(4), (void *)GPR(5));
850                  break;
851 +        case NATIVE_ETHER_WPUT:
852 +                GPR(3) = ether_wput((queue_t *)GPR(3), (mblk_t *)GPR(4));
853 +                break;
854 +        case NATIVE_ETHER_RSRV:
855 +                GPR(3) = ether_rsrv((queue_t *)GPR(3));
856 +                break;
857 + #else
858 +        case NATIVE_ETHER_INIT:
859 +                // FIXME: needs more complicated thunks
860 +                GPR(3) = false;
861 +                break;
862 + #endif
863          case NATIVE_SERIAL_NOTHING:
864          case NATIVE_SERIAL_OPEN:
865          case NATIVE_SERIAL_PRIME_IN:
# Line 775 | Line 880 | static void NativeOp(int selector)
880                  GPR(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](GPR(3), GPR(4));
881                  break;
882          }
883 +        case NATIVE_GET_RESOURCE:
884 +        case NATIVE_GET_1_RESOURCE:
885 +        case NATIVE_GET_IND_RESOURCE:
886 +        case NATIVE_GET_1_IND_RESOURCE:
887 +        case NATIVE_R_GET_RESOURCE: {
888 +                typedef void (*GetResourceCallback)(void);
889 +                static const GetResourceCallback get_resource_callbacks[] = {
890 +                        get_resource,
891 +                        get_1_resource,
892 +                        get_ind_resource,
893 +                        get_1_ind_resource,
894 +                        r_get_resource
895 +                };
896 +                get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
897 +                break;
898 +        }
899          case NATIVE_DISABLE_INTERRUPT:
900                  DisableInterrupt();
901                  break;
# Line 789 | Line 910 | static void NativeOp(int selector)
910                  QuitEmulator();
911                  break;
912          }
792 }
913  
914 < /*
915 < *  Execute native subroutine (LR must contain return address)
916 < */
797 <
798 < void ExecuteNative(int selector)
799 < {
800 <        uint32 tvect[2];
801 <        tvect[0] = tswap32(POWERPC_NATIVE_OP_FUNC(selector));
802 <        tvect[1] = 0; // Fake TVECT
803 <        RoutineDescriptor desc = BUILD_PPC_ROUTINE_DESCRIPTOR(0, tvect);
804 <        M68kRegisters r;
805 <        Execute68k((uint32)&desc, &r);
914 > #if EMUL_TIME_STATS
915 >        native_exec_time += (clock() - native_exec_start);
916 > #endif
917   }
918  
919   /*
# Line 823 | Line 934 | void Execute68k(uint32 pc, M68kRegisters
934  
935   void Execute68kTrap(uint16 trap, M68kRegisters *r)
936   {
937 <        uint16 proc[2];
938 <        proc[0] = htons(trap);
939 <        proc[1] = htons(M68K_RTS);
940 <        Execute68k((uint32)proc, r);
937 >        SheepVar proc_var(4);
938 >        uint32 proc = proc_var.addr();
939 >        WriteMacInt16(proc, trap);
940 >        WriteMacInt16(proc + 2, M68K_RTS);
941 >        Execute68k(proc, r);
942   }
943  
944   /*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines