Index: /trunk/include/VBox/err.mac =================================================================== --- /trunk/include/VBox/err.mac (revision 41299) +++ /trunk/include/VBox/err.mac (revision 41300) @@ -90,5 +90,6 @@ %define VERR_DBGF_HYPER_DB_XCPT (-1217) %define VERR_DBGF_STACK_IPE_1 (-1218) -%define VERR_DBGF_STACK_IPE_2 (-1218) +%define VERR_DBGF_STACK_IPE_2 (-1219) +%define VERR_DBGF_NO_TRACE_BUFFER (-1220) %define VWRN_CONTINUE_ANALYSIS 1400 %define VWRN_CONTINUE_RECOMPILE VWRN_CONTINUE_ANALYSIS @@ -102,5 +103,5 @@ %define VWRN_PATCH_REMOVED 1407 %define VINF_PATM_PATCH_TRAP_GP 1408 -%define VINF_PATM_LEAVEGC_FIRST VINF_PATM_PATCH_TRAP_GP +%define VINF_PATM_LEAVE_RC_FIRST VINF_PATM_PATCH_TRAP_GP %define VINF_PATM_PATCH_TRAP_PF 1409 %define VINF_PATM_PATCH_INT3 1410 @@ -111,5 +112,5 @@ %define VINF_PATM_HC_MMIO_PATCH_READ 1415 %define VINF_PATM_PENDING_IRQ_AFTER_IRET 1416 -%define VINF_PATM_LEAVEGC_LAST VINF_PATM_PENDING_IRQ_AFTER_IRET +%define VINF_PATM_LEAVE_RC_LAST VINF_PATM_PENDING_IRQ_AFTER_IRET %define VERR_PATCH_NO_CONFLICT (-1425) %define VERR_PATM_UNSAFE_CODE (-1426) @@ -289,7 +290,7 @@ %define VERR_VM_UNEXPECTED_VM_STATE (-1915) %define VERR_VM_UNEXPECTED_UNSTABLE_STATE (-1916) -%define VERR_VM_REQUEST_TOO_MANY_ARGS_IPE (-1017) -%define VERR_VM_FATAL_WAIT_ERROR (-1018) -%define VERR_VM_REQUEST_KILLED (-1019) +%define VERR_VM_REQUEST_TOO_MANY_ARGS_IPE (-1917) +%define VERR_VM_FATAL_WAIT_ERROR (-1918) +%define VERR_VM_REQUEST_KILLED (-1919) %define VINF_VRDP_SUCCESS VINF_SUCCESS %define VERR_VRDP_TIMEOUT VERR_TIMEOUT @@ -360,10 +361,10 @@ %define VERR_SELM_LDT_OUT_OF_BOUNDS (-2506) %define VERR_IOM_INVALID_IOPORT_RANGE (-2600) -%define VERR_IOM_NO_HC_IOPORT_RANGE (-2601) +%define VERR_IOM_NO_R3_IOPORT_RANGE (-2601) %define VERR_IOM_IOPORT_RANGE_CONFLICT (-2602) %define VERR_IOM_IOPORT_RANGE_NOT_FOUND (-2603) %define VERR_IOM_NOT_IOPORT_RANGE_OWNER (-2604) %define VERR_IOM_INVALID_MMIO_RANGE (-2605) -%define VERR_IOM_NO_HC_MMIO_RANGE (-2606) +%define VERR_IOM_NO_R3_MMIO_RANGE (-2606) %define VERR_IOM_NOT_MMIO_RANGE_OWNER (-2607) %define VERR_IOM_MMIO_RANGE_CONFLICT (-2608) @@ -376,9 +377,9 @@ %define VINF_IOM_MMIO_UNUSED_00 2615 %define VINF_IOM_MMIO_UNUSED_FF 2616 -%define VINF_IOM_HC_IOPORT_READ 2620 -%define VINF_IOM_HC_IOPORT_WRITE 2621 -%define VINF_IOM_HC_MMIO_READ 2623 -%define VINF_IOM_HC_MMIO_WRITE 2624 -%define VINF_IOM_HC_MMIO_READ_WRITE 2625 +%define VINF_IOM_R3_IOPORT_READ 2620 +%define VINF_IOM_R3_IOPORT_WRITE 2621 +%define VINF_IOM_R3_MMIO_READ 2623 +%define VINF_IOM_R3_MMIO_WRITE 2624 +%define VINF_IOM_R3_MMIO_READ_WRITE 2625 %define VERR_IOM_IOPORT_UNKNOWN_OPCODE (-2630) %define VERR_IOM_IOPORT_IPE_1 (-2631) @@ -400,4 +401,5 @@ %define VERR_VMM_UNKNOWN_RING3_CALL (-2710) %define VERR_VMM_RING3_CALL_NO_RC (-2711) +%define VINF_VMM_CALL_TRACER (2712) %define VERR_PDM_NO_SUCH_LUN (-2800) %define VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES (-2801) @@ -470,5 +472,4 @@ %define VERR_PDM_TOO_MANY_DEVICE_INSTANCES (-2867) %define VERR_PDM_TOO_MANY_DRIVER_INSTANCES (-2868) -%define VERR_PDM_TOO_MANY_USB_DEVICE_INSTANCES (-2869) %define VERR_PDM_TOO_MANY_USB_DEVICE_INSTANCES (-2869) %define VERR_PDM_DEVINS_VERSION_MISMATCH (-2870) @@ -553,4 +554,5 @@ %define VERR_VD_IMAGE_REPAIR_NOT_SUPPORTED (-3280) %define VERR_VD_IMAGE_REPAIR_IMPOSSIBLE (-3281) +%define VERR_VD_READ_OUT_OF_RANGE (-3282) %define VERR_VBGL_NOT_INITIALIZED (-3300) %define VERR_VBGL_INVALID_ADDR (-3301) @@ -577,4 +579,38 @@ %define VERR_SUPDRV_SERVICE_NOT_FOUND (-3702) %define VERR_SUPDRV_KERNEL_TOO_OLD_FOR_VTX (-3703) +%define VERR_SUPDRV_VTG_MAGIC (-3704) +%define VERR_SUPDRV_VTG_BITS (-3705) +%define VERR_SUPDRV_VTG_BAD_HDR_MISC (-3706) +%define VERR_SUPDRV_VTG_BAD_HDR_OFF (-3707) +%define VERR_SUPDRV_VTG_BAD_HDR_PTR (-3708) +%define VERR_SUPDRV_VTG_BAD_HDR_TOO_FEW (-3709) +%define VERR_SUPDRV_VTG_BAD_HDR_TOO_MUCH (-3710) +%define VERR_SUPDRV_VTG_BAD_HDR_NOT_MULTIPLE (-3711) +%define VERR_SUPDRV_VTG_STRTAB_OFF (-3712) +%define VERR_SUPDRV_VTG_BAD_STRING (-3713) +%define VERR_SUPDRV_VTG_STRING_TOO_LONG (-3714) +%define VERR_SUPDRV_VTG_BAD_ATTR (-3715) +%define VERR_SUPDRV_VTG_BAD_PROVIDER (-3716) +%define VERR_SUPDRV_VTG_BAD_PROBE (-3717) +%define VERR_SUPDRV_VTG_BAD_ARGLIST (-3718) +%define VERR_SUPDRV_VTG_BAD_PROBE_ENABLED (-3719) +%define VERR_SUPDRV_VTG_BAD_PROBE_LOC (-3720) +%define VERR_SUPDRV_VTG_ALREADY_REGISTERED (-3721) +%define VERR_SUPDRV_VTG_ONLY_ONCE_PER_SESSION (-3722) +%define VERR_SUPDRV_TRACER_ALREADY_REGISTERED (-3723) +%define VERR_SUPDRV_TRACER_NOT_REGISTERED (-3724) +%define VERR_SUPDRV_TRACER_ALREADY_OPENED (-3725) +%define VERR_SUPDRV_TRACER_NOT_OPENED (-3726) +%define VERR_SUPDRV_TRACER_NOT_PRESENT (-3727) +%define VERR_SUPDRV_TRACER_UNLOADING (-3728) +%define VERR_SUPDRV_TRACER_SESSION_BUSY (-3729) +%define VERR_SUPDRV_TRACER_CANNOT_OPEN_SELF (-3730) +%define VERR_SUPDRV_TRACER_BAD_ARG_FLAGS (-3731) +%define VERR_SUPDRV_TRACER_TOO_MANY_PROVIDERS (-3732) +%define VERR_SUPDRV_TRACER_TOO_LARGE (-3733) +%define VERR_SUPDRV_TRACER_UMOD_NOT_ADJACENT (-3734) +%define VERR_SUPDRV_TRACER_UMOD_TOO_MANY_PROBES (-3735) +%define VERR_SUPDRV_TRACER_UMOD_STRTAB_TOO_BIG (-3736) +%define VERR_SUPDRV_TRACER_UMOD_STRTAB_OFF_BAD (-3737) %define VERR_SUPLIB_PATH_NOT_ABSOLUTE (-3750) %define VERR_SUPLIB_PATH_NOT_CLEAN (-3751) Index: /trunk/include/iprt/err.mac =================================================================== --- /trunk/include/iprt/err.mac (revision 41299) +++ /trunk/include/iprt/err.mac (revision 41300) @@ -120,4 +120,5 @@ %define VINF_BUFFER_UNDERFLOW 22401 %define VERR_UNEVEN_INPUT (-22402) +%define VERR_NOT_AVAILABLE (-22403) %define VERR_FILE_IO_ERROR (-100) %define VERR_OPEN_FAILED (-101) @@ -447,6 +448,6 @@ %define VERR_DVM_MAP_NO_VOLUME (-22201) %define VERR_LOG_REVISION_MISMATCH (-22300) -%define VERR_SYS_CANNOT_POWER_OFF (-22400) -%define VINF_SYS_MAY_POWER_OFF (22401) -%define VERR_SYS_SHUTDOWN_FAILED (-22402) -%define VERR_FILESYSTEM_CORRUPT (-22500) +%define VERR_SYS_CANNOT_POWER_OFF (-22500) +%define VINF_SYS_MAY_POWER_OFF (22501) +%define VERR_SYS_SHUTDOWN_FAILED (-22502) +%define VERR_FILESYSTEM_CORRUPT (-22600) Index: /trunk/include/iprt/x86.mac =================================================================== --- /trunk/include/iprt/x86.mac (revision 41299) +++ /trunk/include/iprt/x86.mac (revision 41300) @@ -1,5 +1,14 @@ %ifndef ___iprt_x86_h %define ___iprt_x86_h +%ifndef VBOX_FOR_DTRACE_LIB +%else +%endif %ifdef RT_OS_SOLARIS +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB %endif %define X86_EFL_CF RT_BIT(0) @@ -24,4 +33,10 @@ %define X86_EFL_GET_IOPL(efl) (((efl) >> X86_EFL_IOPL_SHIFT) & 3) %define X86_EFL_POPF_BITS (X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF | X86_EFL_SF | X86_EFL_TF | X86_EFL_IF | X86_EFL_DF | X86_EFL_OF | X86_EFL_IOPL | X86_EFL_NT | X86_EFL_AC | X86_EFL_ID) +%ifndef VBOX_FOR_DTRACE_LIB +%else +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%else +%endif %define X86_CPUID_VENDOR_INTEL_EBX 0x756e6547 %define X86_CPUID_VENDOR_INTEL_ECX 0x6c65746e @@ -270,4 +285,35 @@ %define MSR_IA32_MISC_ENABLE_XTPR_MSG_DISABLE RT_BIT(23) %define MSR_IA32_MISC_ENABLE_XD_DISABLE RT_BIT(34) +%define IA32_MTRR_PHYSBASE0 0x200 +%define IA32_MTRR_PHYSMASK0 0x201 +%define IA32_MTRR_PHYSBASE1 0x202 +%define IA32_MTRR_PHYSMASK1 0x203 +%define IA32_MTRR_PHYSBASE2 0x204 +%define IA32_MTRR_PHYSMASK2 0x205 +%define IA32_MTRR_PHYSBASE3 0x206 +%define IA32_MTRR_PHYSMASK3 0x207 +%define IA32_MTRR_PHYSBASE4 0x208 +%define IA32_MTRR_PHYSMASK4 0x209 +%define IA32_MTRR_PHYSBASE5 0x20a +%define IA32_MTRR_PHYSMASK5 0x20b +%define IA32_MTRR_PHYSBASE6 0x20c +%define IA32_MTRR_PHYSMASK6 0x20d +%define IA32_MTRR_PHYSBASE7 0x20e +%define IA32_MTRR_PHYSMASK7 0x20f +%define IA32_MTRR_PHYSBASE8 0x210 +%define IA32_MTRR_PHYSMASK8 0x211 +%define IA32_MTRR_PHYSBASE9 0x212 +%define IA32_MTRR_PHYSMASK9 0x213 +%define IA32_MTRR_FIX64K_00000 0x250 +%define IA32_MTRR_FIX16K_80000 0x258 +%define IA32_MTRR_FIX16K_A0000 0x259 +%define IA32_MTRR_FIX4K_C0000 0x268 +%define IA32_MTRR_FIX4K_C8000 0x269 +%define IA32_MTRR_FIX4K_D0000 0x26a +%define IA32_MTRR_FIX4K_D8000 0x26b +%define IA32_MTRR_FIX4K_E0000 0x26c +%define IA32_MTRR_FIX4K_E8000 0x26d +%define IA32_MTRR_FIX4K_F0000 0x26e +%define IA32_MTRR_FIX4K_F8000 0x26f %define MSR_IA32_MTRR_DEF_TYPE 0x2FF %define MSR_IA32_MC0_CTL 0x400 @@ -314,5 +360,4 @@ %define MSR_K7_PERFCTR2 0xc0010006 %define MSR_K7_PERFCTR3 0xc0010007 -%define MSR_K8_HWCR 0xc0010015 %define MSR_K8_LSTAR 0xc0000082 %define MSR_K8_CSTAR 0xc0000083 @@ -484,4 +529,5 @@ %define X86_FCW_PM RT_BIT(5) %define X86_FCW_MASK_ALL 0x007f +%define X86_FCW_XCPT_MASK 0x003f %define X86_FCW_PC_MASK 0x0300 %define X86_FCW_PC_24 0x0000 @@ -494,4 +540,21 @@ %define X86_FCW_RC_UP 0x0800 %define X86_FCW_RC_ZERO 0x0c00 +%define X86_FCW_ZERO_MASK 0xf080 +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif %if HC_ARCH_BITS == 64 %else @@ -556,4 +619,8 @@ %define X86_DESC_DB RT_BIT(22) %define X86_DESC_G RT_BIT(23) +%ifndef VBOX_FOR_DTRACE_LIB +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%endif %define X86_SEL_SHIFT 3 %define X86_SEL_MASK 0xfff8 @@ -570,4 +637,10 @@ %define X86_TRAP_PF_RSVD RT_BIT(3) %define X86_TRAP_PF_ID RT_BIT(4) +%ifndef VBOX_FOR_DTRACE_LIB +%else +%endif +%ifndef VBOX_FOR_DTRACE_LIB +%else +%endif %define X86_MODRM_RM_MASK 0x07 %define X86_MODRM_REG_MASK 0x38 @@ -577,4 +650,6 @@ %define X86_MODRM_MOD_SMASK 0x03 %define X86_MODRM_MOD_SHIFT 6 +%ifndef VBOX_FOR_DTRACE_LIB +%endif %define X86_SIB_BASE_MASK 0x07 %define X86_SIB_INDEX_MASK 0x38 @@ -584,4 +659,6 @@ %define X86_SIB_SCALE_SMASK 0x03 %define X86_SIB_SCALE_SHIFT 6 +%ifndef VBOX_FOR_DTRACE_LIB +%endif %define X86_GREG_xAX 0 %define X86_GREG_xCX 1