summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Core')
-rw-r--r--lldb/source/Core/Value.cpp48
-rw-r--r--lldb/source/Core/ValueObject.cpp10
-rw-r--r--lldb/source/Core/ValueObjectChild.cpp2
-rw-r--r--lldb/source/Core/ValueObjectConstResult.cpp2
-rw-r--r--lldb/source/Core/ValueObjectRegister.cpp2
-rw-r--r--lldb/source/Core/ValueObjectVariable.cpp4
6 files changed, 34 insertions, 34 deletions
diff --git a/lldb/source/Core/Value.cpp b/lldb/source/Core/Value.cpp
index 76f109744ff..920c467333e 100644
--- a/lldb/source/Core/Value.cpp
+++ b/lldb/source/Core/Value.cpp
@@ -287,7 +287,7 @@ Value::GetRegisterInfo()
if (m_context_type == eContextTypeValue)
return ((Value*)m_context)->GetRegisterInfo();
- if (m_context_type == eContextTypeDCRegisterInfo)
+ if (m_context_type == eContextTypeRegisterInfo)
return static_cast<RegisterInfo *> (m_context);
return NULL;
}
@@ -298,7 +298,7 @@ Value::GetType()
if (m_context_type == eContextTypeValue)
return ((Value*)m_context)->GetType();
- if (m_context_type == eContextTypeDCType)
+ if (m_context_type == eContextTypeLLDBType)
return static_cast<Type *> (m_context);
return NULL;
}
@@ -336,12 +336,12 @@ Value::ValueOf(ExecutionContext *exe_ctx, clang::ASTContext *ast_context)
{
default:
case eContextTypeInvalid:
- case eContextTypeOpaqueClangQualType: // clang::Type *
- case eContextTypeDCRegisterInfo: // RegisterInfo *
- case eContextTypeDCType: // Type *
+ case eContextTypeClangType: // clang::Type *
+ case eContextTypeRegisterInfo: // RegisterInfo *
+ case eContextTypeLLDBType: // Type *
break;
- case eContextTypeDCVariable: // Variable *
+ case eContextTypeVariable: // Variable *
ResolveValue(exe_ctx, ast_context);
return true;
}
@@ -365,7 +365,7 @@ Value::GetValueByteSize (clang::ASTContext *ast_context, Error *error_ptr)
error_ptr->SetErrorString ("Invalid context type, there is no way to know how much memory to read.");
break;
- case eContextTypeOpaqueClangQualType:
+ case eContextTypeClangType:
if (ast_context == NULL)
{
if (error_ptr)
@@ -378,7 +378,7 @@ Value::GetValueByteSize (clang::ASTContext *ast_context, Error *error_ptr)
}
break;
- case eContextTypeDCRegisterInfo: // RegisterInfo *
+ case eContextTypeRegisterInfo: // RegisterInfo *
if (GetRegisterInfo())
byte_size = GetRegisterInfo()->byte_size;
else if (error_ptr)
@@ -386,14 +386,14 @@ Value::GetValueByteSize (clang::ASTContext *ast_context, Error *error_ptr)
break;
- case eContextTypeDCType: // Type *
+ case eContextTypeLLDBType: // Type *
if (GetType())
byte_size = GetType()->GetByteSize();
else if (error_ptr)
error_ptr->SetErrorString ("Can't determine byte size with NULL Type *.");
break;
- case eContextTypeDCVariable: // Variable *
+ case eContextTypeVariable: // Variable *
if (GetVariable())
byte_size = GetVariable()->GetType()->GetByteSize();
else if (error_ptr)
@@ -428,18 +428,18 @@ Value::GetClangType ()
case eContextTypeInvalid:
break;
- case eContextTypeOpaqueClangQualType:
+ case eContextTypeClangType:
return m_context;
- case eContextTypeDCRegisterInfo:
+ case eContextTypeRegisterInfo:
break; // TODO: Eventually convert into a clang type?
- case eContextTypeDCType:
+ case eContextTypeLLDBType:
if (GetType())
return GetType()->GetClangType();
break;
- case eContextTypeDCVariable:
+ case eContextTypeVariable:
if (GetVariable())
return GetVariable()->GetType()->GetClangType();
break;
@@ -460,20 +460,20 @@ Value::GetValueDefaultFormat ()
case eContextTypeInvalid:
break;
- case eContextTypeOpaqueClangQualType:
+ case eContextTypeClangType:
return ClangASTType::GetFormat (m_context);
- case eContextTypeDCRegisterInfo:
+ case eContextTypeRegisterInfo:
if (GetRegisterInfo())
return GetRegisterInfo()->format;
break;
- case eContextTypeDCType:
+ case eContextTypeLLDBType:
if (GetType())
return GetType()->GetFormat();
break;
- case eContextTypeDCVariable:
+ case eContextTypeVariable:
if (GetVariable())
return GetVariable()->GetType()->GetFormat();
break;
@@ -669,7 +669,7 @@ Value::ResolveValue(ExecutionContext *exe_ctx, clang::ASTContext *ast_context)
}
}
- if (m_context_type == eContextTypeOpaqueClangQualType)
+ if (m_context_type == eContextTypeClangType)
{
void *opaque_clang_qual_type = GetClangType();
switch (m_value_type)
@@ -731,7 +731,7 @@ Value::GetVariable()
if (m_context_type == eContextTypeValue)
return ((Value*)m_context)->GetVariable();
- if (m_context_type == eContextTypeDCVariable)
+ if (m_context_type == eContextTypeVariable)
return static_cast<Variable *> (m_context);
return NULL;
}
@@ -757,10 +757,10 @@ Value::GetContextTypeAsCString (ContextType context_type)
switch (context_type)
{
case eContextTypeInvalid: return "invalid";
- case eContextTypeOpaqueClangQualType: return "clang::Type *";
- case eContextTypeDCRegisterInfo: return "RegisterInfo *";
- case eContextTypeDCType: return "Type *";
- case eContextTypeDCVariable: return "Variable *";
+ case eContextTypeClangType: return "clang::Type *";
+ case eContextTypeRegisterInfo: return "RegisterInfo *";
+ case eContextTypeLLDBType: return "Type *";
+ case eContextTypeVariable: return "Variable *";
case eContextTypeValue: return "Value"; // TODO: Sean, more description here?
};
return "???";
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index a3da90d9c3a..64c646ba567 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -179,7 +179,7 @@ ValueObject::GetLocationAsCString (ExecutionContextScope *exe_scope)
break;
case Value::eValueTypeScalar:
- if (m_value.GetContextType() == Value::eContextTypeDCRegisterInfo)
+ if (m_value.GetContextType() == Value::eContextTypeRegisterInfo)
{
RegisterInfo *reg_info = m_value.GetRegisterInfo();
if (reg_info)
@@ -611,9 +611,9 @@ ValueObject::GetValueAsCString (ExecutionContextScope *exe_scope)
switch (context_type)
{
- case Value::eContextTypeOpaqueClangQualType:
- case Value::eContextTypeDCType:
- case Value::eContextTypeDCVariable:
+ case Value::eContextTypeClangType:
+ case Value::eContextTypeLLDBType:
+ case Value::eContextTypeVariable:
{
clang_type_t clang_type = GetClangType ();
if (clang_type)
@@ -638,7 +638,7 @@ ValueObject::GetValueAsCString (ExecutionContextScope *exe_scope)
}
break;
- case Value::eContextTypeDCRegisterInfo:
+ case Value::eContextTypeRegisterInfo:
{
const RegisterInfo *reg_info = m_value.GetRegisterInfo();
if (reg_info)
diff --git a/lldb/source/Core/ValueObjectChild.cpp b/lldb/source/Core/ValueObjectChild.cpp
index ec935845614..2e1937228af 100644
--- a/lldb/source/Core/ValueObjectChild.cpp
+++ b/lldb/source/Core/ValueObjectChild.cpp
@@ -135,7 +135,7 @@ ValueObjectChild::UpdateValue (ExecutionContextScope *exe_scope)
{
if (parent->UpdateValueIfNeeded(exe_scope))
{
- m_value.SetContext(Value::eContextTypeOpaqueClangQualType, m_clang_type);
+ m_value.SetContext(Value::eContextTypeClangType, m_clang_type);
// Copy the parent scalar value and the scalar value type
m_value.GetScalar() = parent->GetValue().GetScalar();
diff --git a/lldb/source/Core/ValueObjectConstResult.cpp b/lldb/source/Core/ValueObjectConstResult.cpp
index 93e2d3eb05a..ef7c7b9e3b1 100644
--- a/lldb/source/Core/ValueObjectConstResult.cpp
+++ b/lldb/source/Core/ValueObjectConstResult.cpp
@@ -44,7 +44,7 @@ ValueObjectConstResult::ValueObjectConstResult
m_data.SetData(data_sp);
m_value.GetScalar() = (uintptr_t)data_sp->GetBytes();
m_value.SetValueType(Value::eValueTypeHostAddress);
- m_value.SetContext(Value::eContextTypeOpaqueClangQualType, clang_type);
+ m_value.SetContext(Value::eContextTypeClangType, clang_type);
m_name = name;
SetIsConstant ();
SetValueIsValid(true);
diff --git a/lldb/source/Core/ValueObjectRegister.cpp b/lldb/source/Core/ValueObjectRegister.cpp
index 7f3603f032a..dabf838bea7 100644
--- a/lldb/source/Core/ValueObjectRegister.cpp
+++ b/lldb/source/Core/ValueObjectRegister.cpp
@@ -319,7 +319,7 @@ ValueObjectRegister::UpdateValue (ExecutionContextScope *exe_scope)
{
if (m_reg_ctx->ReadRegisterBytes (m_reg_num, m_data))
{
- m_value.SetContext(Value::eContextTypeDCRegisterInfo, (void *)m_reg_info);
+ m_value.SetContext(Value::eContextTypeRegisterInfo, (void *)m_reg_info);
m_value.SetValueType(Value::eValueTypeHostAddress);
m_value.GetScalar() = (uintptr_t)m_data.GetDataStart();
SetValueIsValid (true);
diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/Core/ValueObjectVariable.cpp
index 104aa1f0e21..4f8bfe248fd 100644
--- a/lldb/source/Core/ValueObjectVariable.cpp
+++ b/lldb/source/Core/ValueObjectVariable.cpp
@@ -120,7 +120,7 @@ ValueObjectVariable::UpdateValue (ExecutionContextScope *exe_scope)
Value old_value(m_value);
if (expr.Evaluate (&exe_ctx, GetClangAST(), loclist_base_load_addr, NULL, m_value, &m_error))
{
- m_value.SetContext(Value::eContextTypeDCVariable, variable);
+ m_value.SetContext(Value::eContextTypeVariable, variable);
Value::ValueType value_type = m_value.GetValueType();
@@ -184,7 +184,7 @@ ValueObjectVariable::UpdateValue (ExecutionContextScope *exe_scope)
// Copy the Value and set the context to use our Variable
// so it can extract read its value into m_data appropriately
Value value(m_value);
- value.SetContext(Value::eContextTypeDCVariable, variable);
+ value.SetContext(Value::eContextTypeVariable, variable);
m_error = value.GetValueAsData(&exe_ctx, GetClangAST(), m_data, 0);
}
break;
OpenPOWER on IntegriCloud