[KD64]
[reactos.git] / reactos / ntoskrnl / kd64 / amd64 / kdsup.c
index 24ab107..2f293d7 100644 (file)
@@ -21,20 +21,8 @@ VOID
 NTAPI
 KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version)
 {
-    Version->MajorVersion = 0;
-    Version->MinorVersion = 0;
-    Version->ProtocolVersion = DBGKD_64BIT_PROTOCOL_VERSION2;
-    Version->KdSecondaryVersion = KD_SECONDARY_VERSION_AMD64_CONTEXT;
-    Version->Flags = DBGKD_VERS_FLAG_PTR64 | DBGKD_VERS_FLAG_DATA;
-    Version->MachineType = IMAGE_FILE_MACHINE_AMD64;
-    Version->MaxPacketType = PACKET_TYPE_MAX;
-    Version->MaxStateChange = 0;
-    Version->MaxManipulate = 0;
-    Version->Simulation = DBGKD_SIMULATION_NONE;
-    Version->Unused[0] = 0;
-    Version->KernBase = 0xfffff80000800000ULL;
-    Version->PsLoadedModuleList = (ULONG_PTR)&KeLoaderBlock->LoadOrderListHead;
-    Version->DebuggerDataList = 0;
+    /* Copy the version block */
+    RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64));
 }
 
 VOID
@@ -107,7 +95,7 @@ KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange,
     WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS;
     if (WaitStateChange->ControlReport.SegCs == KGDT_64_R0_CODE)
     {
-        WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS;
+        WaitStateChange->ControlReport.ReportFlags |= REPORT_STANDARD_CS;
     }
 }
 
@@ -116,7 +104,17 @@ NTAPI
 KdpSysReadMsr(IN ULONG Msr,
               OUT PLARGE_INTEGER MsrValue)
 {
-    MsrValue->QuadPart = __readmsr(Msr);
+    /* Use SEH to protect from invalid MSRs */
+    _SEH2_TRY
+    {
+        MsrValue->QuadPart = __readmsr(Msr);
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        _SEH2_YIELD(return STATUS_NO_SUCH_DEVICE);
+    }
+    _SEH2_END
+
     return STATUS_SUCCESS;
 }
 
@@ -125,7 +123,17 @@ NTAPI
 KdpSysWriteMsr(IN ULONG Msr,
                IN PLARGE_INTEGER MsrValue)
 {
-    __writemsr(Msr, MsrValue->QuadPart);
+    /* Use SEH to protect from invalid MSRs */
+    _SEH2_TRY
+    {
+        __writemsr(Msr, MsrValue->QuadPart);
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        _SEH2_YIELD(return STATUS_NO_SUCH_DEVICE);
+    }
+    _SEH2_END
+
     return STATUS_SUCCESS;
 }
 
@@ -177,28 +185,35 @@ KdpSysReadControlSpace(IN ULONG Processor,
 
         switch ((ULONG_PTR)BaseAddress)
         {
-            case 0:
+            case DEBUG_CONTROL_SPACE_KPCR:
                 /* Copy a pointer to the Pcr */
                 ControlStart = &Pcr;
                 RealLength = sizeof(PVOID);
                 break;
 
-            case 1:
+            case DEBUG_CONTROL_SPACE_KPRCB:
                 /* Copy a pointer to the Prcb */
                 ControlStart = &Prcb;
                 RealLength = sizeof(PVOID);
                 break;
 
-            case 2:
+            case DEBUG_CONTROL_SPACE_KSPECIAL:
                 /* Copy SpecialRegisters */
                 ControlStart = &Prcb->ProcessorState.SpecialRegisters;
                 RealLength = sizeof(KSPECIAL_REGISTERS);
                 break;
 
+            case DEBUG_CONTROL_SPACE_KTHREAD:
+                /* Copy a pointer to the current Thread */
+                ControlStart = &Prcb->CurrentThread;
+                RealLength = sizeof(PVOID);
+                break;
+
             default:
                 RealLength = 0;
                 ControlStart = NULL;
                 ASSERT(FALSE);
+                return STATUS_UNSUCCESSFUL;
         }
 
         if (RealLength < Length) Length = RealLength;
@@ -237,28 +252,95 @@ KdpSysReadIoSpace(IN ULONG InterfaceType,
                   IN ULONG BusNumber,
                   IN ULONG AddressSpace,
                   IN ULONG64 IoAddress,
-                  IN PULONG DataValue,
+                  OUT PVOID DataValue,
                   IN ULONG DataSize,
                   OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED;
-    while (TRUE);
-    return STATUS_UNSUCCESSFUL;
+    /* Verify parameters */
+    if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1)
+    {
+        /* No data was read */
+        *ActualDataSize = 0;
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    switch (DataSize)
+    {
+        case sizeof(UCHAR):
+            /* read one UCHAR */
+            *(PUCHAR)DataValue = READ_PORT_UCHAR((PUCHAR)IoAddress);
+            break;
+
+        case sizeof(USHORT):
+            /* Read one USHORT */
+            *(PUSHORT)DataValue = READ_PORT_USHORT((PUSHORT)IoAddress);
+            break;
+
+        case sizeof(ULONG):
+            /* Read one ULONG */
+            *(PULONG)DataValue = READ_PORT_ULONG((PULONG)IoAddress);
+            break;
+
+        default:
+            /* Invalid data size */
+             *ActualDataSize = 0;
+            return STATUS_UNSUCCESSFUL;
+    }
+
+    /* Return the size of the data */
+    *ActualDataSize = DataSize;
+
+    /* Success! */
+    return STATUS_SUCCESS;
 }
 
+
 NTSTATUS
 NTAPI
 KdpSysWriteIoSpace(IN ULONG InterfaceType,
                    IN ULONG BusNumber,
                    IN ULONG AddressSpace,
                    IN ULONG64 IoAddress,
-                   IN PULONG DataValue,
+                   IN PVOID DataValue,
                    IN ULONG DataSize,
                    OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED;
-    while (TRUE);
-    return STATUS_UNSUCCESSFUL;
+    /* Verify parameters */
+    if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1)
+    {
+        /* No data was written */
+        *ActualDataSize = 0;
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    switch (DataSize)
+    {
+        case sizeof(UCHAR):
+            /* read one UCHAR */
+            WRITE_PORT_UCHAR((PUCHAR)IoAddress, *(PUCHAR)DataValue);
+            break;
+
+        case sizeof(USHORT):
+            /* Read one USHORT */
+            WRITE_PORT_USHORT((PUSHORT)IoAddress, *(PUSHORT)DataValue);
+            break;
+
+        case sizeof(ULONG):
+            /* Read one ULONG */
+            WRITE_PORT_ULONG((PULONG)IoAddress, *(PULONG)DataValue);
+            break;
+
+        default:
+            /* Invalid data size */
+             *ActualDataSize = 0;
+            return STATUS_UNSUCCESSFUL;
+    }
+
+    /* Return the size of the data */
+    *ActualDataSize = DataSize;
+
+    /* Success! */
+    return STATUS_SUCCESS;
 }
 
 NTSTATUS