commit e7c7c3de9324000feedbf1e332db3e1cedb0a49c
author Jean-Daniel Dupas <devlists@shadowlab.org> Wed Jul 02 09:51:28 2014 +0000
committer Jean-Daniel Dupas <devlists@shadowlab.org> Wed Jul 02 09:51:28 2014 +0000
tree efa93c3a4285a5dec7b719c33cbc658e5fb813ac
parent 70fc29ca86f0f852ed0e3d007cff7b45bb396e7c

Replace uint32_t by lldb::RegisterKing in register context API.

llvm-svn: 212172

lldb/source/Core/EmulateInstruction.cpp

diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp
index bf6c6d8..8349f54 100644
--- a/lldb/source/Core/EmulateInstruction.cpp
+++ b/lldb/source/Core/EmulateInstruction.cpp
@@ -75,7 +75,7 @@
 }
 
 bool
-EmulateInstruction::ReadRegister (uint32_t reg_kind, uint32_t reg_num, RegisterValue& reg_value)
+EmulateInstruction::ReadRegister (lldb::RegisterKind reg_kind, uint32_t reg_num, RegisterValue& reg_value)
 {
     RegisterInfo reg_info;
     if (GetRegisterInfo(reg_kind, reg_num, reg_info))
@@ -84,7 +84,7 @@
 }
 
 uint64_t
-EmulateInstruction::ReadRegisterUnsigned (uint32_t reg_kind, 
+EmulateInstruction::ReadRegisterUnsigned (lldb::RegisterKind reg_kind,
                                           uint32_t reg_num,
                                           uint64_t fail_value, 
                                           bool *success_ptr)
@@ -122,7 +122,7 @@
 
 bool
 EmulateInstruction::WriteRegister (const Context &context, 
-                                   uint32_t reg_kind, 
+                                   lldb::RegisterKind reg_kind,
                                    uint32_t reg_num, 
                                    const RegisterValue& reg_value)
 {
@@ -135,7 +135,7 @@
 
 bool
 EmulateInstruction::WriteRegisterUnsigned (const Context &context,
-                                           uint32_t reg_kind, 
+                                           lldb::RegisterKind reg_kind,
                                            uint32_t reg_num,
                                            uint64_t uint_value)
 {
@@ -392,7 +392,8 @@
 {
     StreamFile strm (stdout, false);
     strm.Printf ("  Read Register (%s)\n", reg_info->name);
-    uint32_t reg_kind, reg_num;
+    lldb::RegisterKind reg_kind;
+    uint32_t reg_num;
     if (GetBestRegisterKindAndNumber (reg_info, reg_kind, reg_num))
         reg_value.SetUInt64((uint64_t)reg_kind << 24 | reg_num);
     else
@@ -608,7 +609,7 @@
 
 bool
 EmulateInstruction::GetBestRegisterKindAndNumber (const RegisterInfo *reg_info, 
-                                                  uint32_t &reg_kind,
+                                                  lldb::RegisterKind &reg_kind,
                                                   uint32_t &reg_num)
 {
     // Generic and DWARF should be the two most popular register kinds when
@@ -653,7 +654,8 @@
 uint32_t
 EmulateInstruction::GetInternalRegisterNumber (RegisterContext *reg_ctx, const RegisterInfo &reg_info)
 {
-    uint32_t reg_kind, reg_num;
+    lldb::RegisterKind reg_kind;
+    uint32_t reg_num;
     if (reg_ctx && GetBestRegisterKindAndNumber (&reg_info, reg_kind, reg_num))
         return reg_ctx->ConvertRegisterKindToRegisterNumber (reg_kind, reg_num);
     return LLDB_INVALID_REGNUM;