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.61 by gbeauche, 2005-06-22T16:38:15Z vs.
Revision 1.65 by gbeauche, 2005-07-03T22:02:01Z

# Line 269 | Line 269 | void sheepshaver_cpu::execute_emul_op(ui
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);
# Line 915 | Line 915 | void emul_ppc(uint32 entry)
915  
916   void TriggerInterrupt(void)
917   {
918 +        idle_resume();
919   #if 0
920    WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
921   #else
# Line 935 | Line 936 | void HandleInterrupt(powerpc_registers *
936          if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
937                  return;
938  
939 <        // 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;
939 >        // Update interrupt count
940   #if EMUL_TIME_STATS
941          interrupt_count++;
942   #endif
# Line 957 | Line 952 | void HandleInterrupt(powerpc_registers *
952   #if INTERRUPTS_IN_NATIVE_MODE
953          case MODE_NATIVE:
954                  // 68k emulator inactive, in nanokernel?
955 <                if (r->gpr[1] != KernelDataAddr && interrupt_depth == 1) {
955 >                if (r->gpr[1] != KernelDataAddr) {
956  
957                          // Prepare for 68k interrupt level 1
958                          WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
# Line 1015 | Line 1010 | void HandleInterrupt(powerpc_registers *
1010                  break;
1011   #endif
1012          }
1018 –
1019 –        // We are done with this interrupt
1020 –        --interrupt_depth;
1013   }
1014  
1015   static void get_resource(void);
# Line 1047 | Line 1039 | void sheepshaver_cpu::execute_native_op(
1039          case NATIVE_VIDEO_DO_DRIVER_IO:
1040                  gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7));
1041                  break;
1042 +        case NATIVE_ETHER_AO_GET_HWADDR:
1043 +                AO_get_ethernet_address(gpr(3));
1044 +                break;
1045 +        case NATIVE_ETHER_AO_ADD_MULTI:
1046 +                AO_enable_multicast(gpr(3));
1047 +                break;
1048 +        case NATIVE_ETHER_AO_DEL_MULTI:
1049 +                AO_disable_multicast(gpr(3));
1050 +                break;
1051 +        case NATIVE_ETHER_AO_SEND_PACKET:
1052 +                AO_transmit_packet(gpr(3));
1053 +                break;
1054          case NATIVE_ETHER_IRQ:
1055                  EtherIRQ();
1056                  break;

Diff Legend

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