VirtualBox

Ignore:
Timestamp:
Dec 4, 2024 3:20:14 PM (6 weeks ago)
Author:
vboxsync
Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/VMMR3/PDM.cpp

    r107113 r107227  
    10311031    {
    10321032        PVMCPU pVCpu = pVM->apCpusR3[idCpu];
    1033 #if defined(VBOX_VMM_TARGET_ARMV8)
     1033#ifdef VBOX_VMM_TARGET_ARMV8
    10341034        SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ));
    10351035        SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ));
    1036 #else
     1036#elif defined(VBOX_VMM_TARGET_X86)
    10371037        SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC));
    10381038        SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC));
     1039#else
     1040# error "port me"
    10391041#endif
    10401042        SSMR3PutU32(pSSM, VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NMI));
     
    10661068    {
    10671069        PVMCPU pVCpu = pVM->apCpusR3[idCpu];
    1068 #if defined(VBOX_VMM_TARGET_ARMV8)
     1070# ifdef VBOX_VMM_TARGET_ARMV8
    10691071        LogFlow(("pdmR3LoadPrep: VCPU %u %s%s\n", idCpu,
    10701072                VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ) ? " VMCPU_FF_INTERRUPT_IRQ" : "",
    10711073                VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ) ? " VMCPU_FF_INTERRUPT_FIQ" : ""));
    1072 #else
     1074# elif defined(VBOX_VMM_TARGET_X86)
    10731075        LogFlow(("pdmR3LoadPrep: VCPU %u %s%s\n", idCpu,
    10741076                VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC) ? " VMCPU_FF_INTERRUPT_APIC" : "",
    10751077                VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC)  ? " VMCPU_FF_INTERRUPT_PIC" : ""));
    1076 #endif
     1078# else
     1079#  error "port me"
     1080# endif
    10771081    }
    10781082#endif
     
    10901094    {
    10911095        PVMCPU pVCpu = pVM->apCpusR3[idCpu];
    1092 #if defined(VBOX_VMM_TARGET_ARMV8)
     1096#ifdef VBOX_VMM_TARGET_ARMV8
    10931097        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_IRQ);
    10941098        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_FIQ);
    1095 #else
     1099#elif defined(VBOX_VMM_TARGET_X86)
    10961100        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_APIC);
    10971101        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_PIC);
     1102#else
     1103# error "port me"
    10981104#endif
    10991105        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI);
     
    11571163                return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
    11581164            }
    1159 #if defined(VBOX_VMM_TARGET_ARMV8)
     1165#ifdef VBOX_VMM_TARGET_ARMV8
    11601166            AssertLogRelMsg(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ),
    11611167                            ("VCPU%03u: VMCPU_FF_INTERRUPT_IRQ set! Devices shouldn't set interrupts during state restore...\n", idCpu));
    11621168            if (fInterruptPending)
    11631169                VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_IRQ);
    1164 #else
     1170
     1171#elif defined(VBOX_VMM_TARGET_X86)
    11651172            AssertLogRelMsg(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC),
    11661173                            ("VCPU%03u: VMCPU_FF_INTERRUPT_APIC set! Devices shouldn't set interrupts during state restore...\n", idCpu));
    11671174            if (fInterruptPending)
    11681175                VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC);
     1176#else
     1177# error "port me"
    11691178#endif
    11701179
     
    11791188                return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
    11801189            }
    1181 #if defined(VBOX_VMM_TARGET_ARMV8)
     1190#ifdef VBOX_VMM_TARGET_ARMV8
    11821191            AssertLogRelMsg(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ),
    11831192                            ("VCPU%03u: VMCPU_FF_INTERRUPT_FIQ set!  Devices shouldn't set interrupts during state restore...\n", idCpu));
    11841193            if (fInterruptPending)
    11851194                VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ);
    1186 #else
     1195
     1196#elif defined(VBOX_VMM_TARGET_X86)
    11871197            AssertLogRelMsg(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC),
    11881198                            ("VCPU%03u: VMCPU_FF_INTERRUPT_PIC set!  Devices shouldn't set interrupts during state restore...\n", idCpu));
    11891199            if (fInterruptPending)
    11901200                VMCPU_FF_SET(pVCpu, VMCPU_FF_INTERRUPT_PIC);
     1201#else
     1202# error "port me"
    11911203#endif
    11921204
     
    17301742VMMR3_INT_DECL(void) PDMR3ResetCpu(PVMCPU pVCpu)
    17311743{
    1732 #if defined(VBOX_VMM_TARGET_ARMV8)
     1744#ifdef VBOX_VMM_TARGET_ARMV8
    17331745    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_IRQ);
    17341746    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_FIQ);
    1735 #else
     1747#elif defined(VBOX_VMM_TARGET_X86)
    17361748    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_APIC);
    17371749    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_PIC);
     1750#else
     1751# error "port me"
    17381752#endif
    17391753    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette