From 3902000ae86bc8402e9c9ca28d13fb14c4f50d81 Mon Sep 17 00:00:00 2001
From: "SND\\kernelnet_cp"
 <SND\kernelnet_cp@9b283d60-5439-405e-af05-b73fd8c4d996>
Date: Tue, 24 Jan 2012 06:41:36 +0000
Subject: [PATCH] [0.1.x] fixed : not integer regsiter not supported now

git-svn-id: https://pykd.svn.codeplex.com/svn@73535 9b283d60-5439-405e-af05-b73fd8c4d996
---
 pykd/cpureg.cpp         | 42 ++++++++++++++++++++++--
 test/scripts/intbase.py |  1 +
 test/scripts/regtest.py | 72 +++++++++++++++++++++++++----------------
 3 files changed, 85 insertions(+), 30 deletions(-)

diff --git a/pykd/cpureg.cpp b/pykd/cpureg.cpp
index 0e22591..e89a080 100644
--- a/pykd/cpureg.cpp
+++ b/pykd/cpureg.cpp
@@ -16,7 +16,32 @@ CpuReg::CpuReg( IDebugClient4 *client, const std::string &regName ) :
 
     hres = m_registers->GetIndexByName( m_name.c_str(), &m_index );
     if ( FAILED( hres ) )
-        throw DbgException( "IDebugRegister::GetIndexByName", hres );    
+        throw DbgException( "IDebugRegister::GetIndexByName", hres );
+
+    DEBUG_REGISTER_DESCRIPTION    desc = {};
+
+    hres = 
+        m_registers->GetDescription( 
+            m_index,
+            NULL,
+            0,
+            NULL,
+            &desc );
+
+    if ( FAILED( hres ) )
+        throw DbgException( "IDebugRegister::GetDescription", hres );
+
+    switch ( desc.Type )
+    {
+    case DEBUG_VALUE_INT8:
+    case DEBUG_VALUE_INT16:
+    case DEBUG_VALUE_INT32:
+    case DEBUG_VALUE_INT64:
+        break;
+
+    default:
+        throw DbgException( "Unsupported register type ( not integer )" );
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -42,6 +67,7 @@ CpuReg::CpuReg( IDebugClient4 *client, ULONG index ) :
         throw DbgException( "IDebugRegister::GetDescription", hres );
 
     std::vector<char>   nameBuffer(nameSize);
+    DEBUG_REGISTER_DESCRIPTION    desc = {};
 
     hres = 
         m_registers->GetDescription( 
@@ -49,11 +75,23 @@ CpuReg::CpuReg( IDebugClient4 *client, ULONG index ) :
             &nameBuffer[0],
             nameSize,
             NULL,
-            NULL );
+            &desc );
 
     if ( FAILED( hres ) )
         throw DbgException( "IDebugRegister::GetDescription", hres );
 
+    switch ( desc.Type )
+    {
+    case DEBUG_VALUE_INT8:
+    case DEBUG_VALUE_INT16:
+    case DEBUG_VALUE_INT32:
+    case DEBUG_VALUE_INT64:
+        break;
+
+    default:
+        throw DbgException( "Unsupported register type ( not integer )" );
+    }
+
     m_name = std::string( &nameBuffer[0] );
     
 }
diff --git a/test/scripts/intbase.py b/test/scripts/intbase.py
index 42a9545..557fc9e 100644
--- a/test/scripts/intbase.py
+++ b/test/scripts/intbase.py
@@ -169,4 +169,5 @@ class IntBaseTest( unittest.TestCase ):
     def testConvert( self ):
         self.assertEqual( "100", "%d" % intBase(100) )
         self.assertEqual( "64", "%x" % intBase(100) )
+       
             
\ No newline at end of file
diff --git a/test/scripts/regtest.py b/test/scripts/regtest.py
index 1864ff9..956911c 100644
--- a/test/scripts/regtest.py
+++ b/test/scripts/regtest.py
@@ -1,34 +1,50 @@
 
-#import unittest
-#import pykd
-#import target
+import unittest
+import target
+import pykd
 
-#class CpuRegTest( unittest.TestCase ):
-  
-#    def testBasic(self):
-#        try:
-#            reg = pykd.cpuReg(0)
-#            self.assertTrue(True)
-#        except pykd.BaseException:
-#            pass     
+class CpuRegTest( unittest.TestCase ):
             
-                
-#    def testGPR(self):
+    def testCtor(self):
+        if pykd.is64bitSystem():
+            pykd.reg("rax")
+        else:
+            pykd.reg("eax")
+             
+        pykd.reg( 0 )
+         
+    def testFormat(self):
+        self.assertEqual( "%d" % int(pykd.reg(0)), "%d" % pykd.reg(0) )
+        self.assertEqual( "%x" % int(pykd.reg(0)), "%x" % pykd.reg(0) )
+        
+    def testGpr(self):
+        if pykd.is64bitSystem():
+            pykd.reg("rax")
+            pykd.reg("rbx")
+            pykd.reg("rcx")
+            pykd.reg("rdx")
+            pykd.reg("rdi")
+            pykd.reg("rsi")
+            pykd.reg("rbp")
+            pykd.reg("rsp")
+            pykd.reg("rip")
+        else:
+            pykd.reg("eax")
+            pykd.reg("ebx")
+            pykd.reg("ecx")
+            pykd.reg("edx")
+            pykd.reg("edi")
+            pykd.reg("esi")
+            pykd.reg("ebp")
+            pykd.reg("esp")
+            pykd.reg("eip")
     
-#        if pykd.is64bitSystem():
+
+    def testFloatRegister(self):
+        "TODO: support float point regsiters"
+        self.assertRaises( pykd.BaseException, pykd.reg, "st0" )
         
-#            rax = pykd.cpuReg("rax")
-#            self.assertEqual( rax, pykd.reg("rax") )
-            
-#            rip = pykd.cpuReg("rip")
-#            self.assertEqual( rip, pykd.reg("rip") )            
+    def testMmxRegister(self):
+        "TODO: support MMX regsiters"
+        self.assertRaises( pykd.BaseException, pykd.reg, "mmx0" )
         
-#        else:
-        
-#            eax = pykd.cpuReg("eax")
-#            self.assertEqual( eax, pykd.reg("eax") )
-        
-#            eip = pykd.cpuReg("eip")
-#            self.assertEqual( eip, pykd.reg("eip") )          
-      
-                             
\ No newline at end of file