[Lldb-commits] [lldb] r166603 - in /lldb/trunk: source/API/SBValue.cpp test/lldbtest.py test/python_api/rdar-12481949/ test/python_api/rdar-12481949/Makefile test/python_api/rdar-12481949/Test-rdar-12481949.py test/python_api/rdar-12481949/main.cpp
Enrico Granata
egranata at apple.com
Wed Oct 24 11:14:22 PDT 2012
Author: enrico
Date: Wed Oct 24 13:14:21 2012
New Revision: 166603
URL: http://llvm.org/viewvc/llvm-project?rev=166603&view=rev
Log:
<rdar://problem/12481949> Fixing SBValue.GetValueAsSigned() to do the right thing when dealing with a 32-bit negative value
Added:
lldb/trunk/test/python_api/rdar-12481949/
lldb/trunk/test/python_api/rdar-12481949/Makefile
lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py
lldb/trunk/test/python_api/rdar-12481949/main.cpp
Modified:
lldb/trunk/source/API/SBValue.cpp
lldb/trunk/test/lldbtest.py
Modified: lldb/trunk/source/API/SBValue.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBValue.cpp?rev=166603&r1=166602&r2=166603&view=diff
==============================================================================
--- lldb/trunk/source/API/SBValue.cpp (original)
+++ lldb/trunk/source/API/SBValue.cpp Wed Oct 24 13:14:21 2012
@@ -1248,7 +1248,7 @@
Mutex::Locker api_locker (target_sp->GetAPIMutex());
Scalar scalar;
if (value_sp->ResolveValue (scalar))
- return scalar.GetRawBits64(fail_value);
+ return scalar.SLongLong(fail_value);
else
error.SetErrorString("could not get value");
}
@@ -1318,7 +1318,7 @@
Mutex::Locker api_locker (target_sp->GetAPIMutex());
Scalar scalar;
if (value_sp->ResolveValue (scalar))
- return scalar.GetRawBits64(fail_value);
+ return scalar.SLongLong(fail_value);
}
}
}
Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=166603&r1=166602&r2=166603&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Wed Oct 24 13:14:21 2012
@@ -32,6 +32,7 @@
"""
import os, sys, traceback
+import os.path
import re
from subprocess import *
import StringIO
@@ -434,6 +435,11 @@
# Fail fast if 'mydir' attribute is not overridden.
if not cls.mydir or len(cls.mydir) == 0:
raise Exception("Subclasses must override the 'mydir' attribute.")
+
+ # Fail fast if 'mydir' is not an existing directory
+ if not os.path.exists(cls.mydir) or not os.path.isdir(cls.mydir):
+ raise Exception("Subclasses must define 'mydir' to be an existing directory.")
+
# Save old working directory.
cls.oldcwd = os.getcwd()
Added: lldb/trunk/test/python_api/rdar-12481949/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/rdar-12481949/Makefile?rev=166603&view=auto
==============================================================================
--- lldb/trunk/test/python_api/rdar-12481949/Makefile (added)
+++ lldb/trunk/test/python_api/rdar-12481949/Makefile Wed Oct 24 13:14:21 2012
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
Added: lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py?rev=166603&view=auto
==============================================================================
--- lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py (added)
+++ lldb/trunk/test/python_api/rdar-12481949/Test-rdar-12481949.py Wed Oct 24 13:14:21 2012
@@ -0,0 +1,67 @@
+"""
+Check that SBValue.GetValueAsSigned() does the right thing for a 32-bit -1.
+"""
+
+import os, time
+import unittest2
+import lldb
+from lldbtest import *
+import lldbutil
+
+class Radar12481949DataFormatterTestCase(TestBase):
+
+ # test for rdar://problem/12481949
+ mydir = os.path.join("python_api", "rdar-12481949")
+
+ @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+ @dsym_test
+ def test_with_dsym_and_run_command(self):
+ """Check that SBValue.GetValueAsSigned() does the right thing for a 32-bit -1."""
+ self.buildDsym()
+ self.rdar12481949_commands()
+
+ @dwarf_test
+ def test_with_dwarf_and_run_command(self):
+ """Check that SBValue.GetValueAsSigned() does the right thing for a 32-bit -1."""
+ self.buildDwarf()
+ self.rdar12481949_commands()
+
+ def setUp(self):
+ # Call super's setUp().
+ TestBase.setUp(self)
+ # Find the line number to break at.
+ self.line = line_number('main.cpp', '// Set break point at this line.')
+
+ def rdar12481949_commands(self):
+ """Check that SBValue.GetValueAsSigned() does the right thing for a 32-bit -1."""
+ self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+
+ lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+
+ self.runCmd("run", RUN_SUCCEEDED)
+
+ # The stop reason of the thread should be breakpoint.
+ self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+ substrs = ['stopped',
+ 'stop reason = breakpoint'])
+
+ # This is the function to remove the custom formats in order to have a
+ # clean slate for the next test case.
+ def cleanup():
+ self.runCmd('type format delete hex', check=False)
+ self.runCmd('type summary clear', check=False)
+
+ # Execute the cleanup function during test case tear down.
+ self.addTearDownHook(cleanup)
+
+ self.assertTrue(self.frame().FindVariable("myvar").GetValueAsSigned() == -1, "GetValueAsSigned() says -1")
+ self.assertTrue(self.frame().FindVariable("myvar").GetValueAsSigned() != 4294967295, "GetValueAsSigned() does not say 0xFFFFFFFF")
+
+ self.assertTrue(self.frame().FindVariable("myvar").GetValueAsUnsigned() != -1, "GetValueAsUnsigned() does not say -1")
+ self.assertTrue(self.frame().FindVariable("myvar").GetValueAsUnsigned() == 4294967295, "GetValueAsUnsigned() says 0xFFFFFFFF")
+
+if __name__ == '__main__':
+ import atexit
+ lldb.SBDebugger.Initialize()
+ atexit.register(lambda: lldb.SBDebugger.Terminate())
+ unittest2.main()
Added: lldb/trunk/test/python_api/rdar-12481949/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/python_api/rdar-12481949/main.cpp?rev=166603&view=auto
==============================================================================
--- lldb/trunk/test/python_api/rdar-12481949/main.cpp (added)
+++ lldb/trunk/test/python_api/rdar-12481949/main.cpp Wed Oct 24 13:14:21 2012
@@ -0,0 +1,17 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <stdio.h>
+#include <stdint.h>
+int main ()
+{
+ int32_t myvar = -1;
+ printf ("%d\n", myvar); // Set break point at this line.
+ return myvar+1;
+}
More information about the lldb-commits
mailing list