[Lldb-commits] [lldb] r105867 - in /lldb/trunk: lldb.xcodeproj/project.pbxproj source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h
Greg Clayton
gclayton at apple.com
Fri Jun 11 18:12:23 PDT 2010
Author: gclayton
Date: Fri Jun 11 20:12:23 2010
New Revision: 105867
URL: http://llvm.org/viewvc/llvm-project?rev=105867&view=rev
Log:
Fixed the build after recent header changes.
Fixed an extra include path in the Xcode project.
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp
lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=105867&r1=105866&r2=105867&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Jun 11 20:12:23 2010
@@ -2925,7 +2925,6 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = 4.2;
- HEADER_SEARCH_PATHS = "${PROJECT_DIR}/include";
INFOPLIST_FILE = "lldb-Info.plist";
INSTALL_PATH = /Developer/usr/bin;
LIBRARY_SEARCH_PATHS = "$(inherited)";
Modified: lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp?rev=105867&r1=105866&r2=105867&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp Fri Jun 11 20:12:23 2010
@@ -479,7 +479,7 @@
return -1;
}
-kern_return_t
+int
RegisterContextMach_arm::ReadGPR (bool force)
{
int set = GPRRegSet;
@@ -491,7 +491,7 @@
return GetError(GPRRegSet, Read);
}
-kern_return_t
+int
RegisterContextMach_arm::ReadFPU (bool force)
{
int set = FPURegSet;
@@ -503,7 +503,7 @@
return GetError(FPURegSet, Read);
}
-kern_return_t
+int
RegisterContextMach_arm::ReadEXC (bool force)
{
int set = EXCRegSet;
@@ -515,7 +515,7 @@
return GetError(EXCRegSet, Read);
}
-kern_return_t
+int
RegisterContextMach_arm::ReadDBG (bool force)
{
int set = DBGRegSet;
@@ -527,7 +527,7 @@
return GetError(DBGRegSet, Read);
}
-kern_return_t
+int
RegisterContextMach_arm::WriteGPR ()
{
int set = GPRRegSet;
@@ -540,7 +540,7 @@
return GetError(GPRRegSet, Write);
}
-kern_return_t
+int
RegisterContextMach_arm::WriteFPU ()
{
int set = FPURegSet;
@@ -553,7 +553,7 @@
return GetError(FPURegSet, Write);
}
-kern_return_t
+int
RegisterContextMach_arm::WriteEXC ()
{
int set = EXCRegSet;
@@ -566,7 +566,7 @@
return GetError(EXCRegSet, Write);
}
-kern_return_t
+int
RegisterContextMach_arm::WriteDBG ()
{
int set = DBGRegSet;
@@ -580,7 +580,7 @@
}
-kern_return_t
+int
RegisterContextMach_arm::ReadRegisterSet (uint32_t set, bool force)
{
switch (set)
@@ -594,7 +594,7 @@
return KERN_INVALID_ARGUMENT;
}
-kern_return_t
+int
RegisterContextMach_arm::WriteRegisterSet (uint32_t set)
{
// Make sure we have a valid context to set.
@@ -1178,7 +1178,7 @@
if (addr & 1)
return LLDB_INVALID_INDEX32;
- kern_return_t kret = ReadDBG (false);
+ int kret = ReadDBG (false);
if (kret == KERN_SUCCESS)
{
@@ -1248,7 +1248,7 @@
bool
RegisterContextMach_arm::ClearHardwareBreakpoint (uint32_t hw_index)
{
- kern_return_t kret = ReadDBG (false);
+ int kret = ReadDBG (false);
const uint32_t num_hw_points = NumSupportedHardwareBreakpoints();
if (kret == KERN_SUCCESS)
@@ -1329,7 +1329,7 @@
return LLDB_INVALID_INDEX32;
// Read the debug state
- kern_return_t kret = ReadDBG (false);
+ int kret = ReadDBG (false);
if (kret == KERN_SUCCESS)
{
@@ -1372,7 +1372,7 @@
bool
RegisterContextMach_arm::ClearHardwareWatchpoint (uint32_t hw_index)
{
- kern_return_t kret = ReadDBG (false);
+ int kret = ReadDBG (false);
const uint32_t num_hw_points = NumSupportedHardwareWatchpoints();
if (kret == KERN_SUCCESS)
Modified: lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h?rev=105867&r1=105866&r2=105867&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h Fri Jun 11 20:12:23 2010
@@ -191,10 +191,10 @@
FPU fpu;
EXC exc;
DBG dbg;
- kern_return_t gpr_errs[2]; // Read/Write errors
- kern_return_t fpu_errs[2]; // Read/Write errors
- kern_return_t exc_errs[2]; // Read/Write errors
- kern_return_t dbg_errs[2]; // Read/Write errors
+ int gpr_errs[2]; // Read/Write errors
+ int fpu_errs[2]; // Read/Write errors
+ int exc_errs[2]; // Read/Write errors
+ int dbg_errs[2]; // Read/Write errors
void
InvalidateAllRegisterStates()
@@ -204,7 +204,7 @@
SetError (EXCRegSet, Read, -1);
}
- kern_return_t
+ int
GetError (int flavor, uint32_t err_idx) const
{
if (err_idx < kNumErrors)
@@ -224,7 +224,7 @@
}
bool
- SetError (int flavor, uint32_t err_idx, kern_return_t err)
+ SetError (int flavor, uint32_t err_idx, int err)
{
if (err_idx < kNumErrors)
{
@@ -255,37 +255,37 @@
bool
RegisterSetIsCached (int set) const
{
- return GetError(set, Read) == KERN_SUCCESS;
+ return GetError(set, Read) == 0;
}
- kern_return_t
+ int
ReadGPR (bool force);
- kern_return_t
+ int
ReadFPU (bool force);
- kern_return_t
+ int
ReadEXC (bool force);
- kern_return_t
+ int
ReadDBG (bool force);
- kern_return_t
+ int
WriteGPR ();
- kern_return_t
+ int
WriteFPU ();
- kern_return_t
+ int
WriteEXC ();
- kern_return_t
+ int
WriteDBG ();
- kern_return_t
+ int
ReadRegisterSet (uint32_t set, bool force);
- kern_return_t
+ int
WriteRegisterSet (uint32_t set);
static uint32_t
More information about the lldb-commits
mailing list