summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Fiala <todd.fiala@gmail.com>2016-02-27 22:48:50 +0000
committerTodd Fiala <todd.fiala@gmail.com>2016-02-27 22:48:50 +0000
commit6993abff141af670e8d9413d539ed6fffabf492a (patch)
tree3038310f56310185e566bf960f4a6913e9644c8a
parent40c589048eff307c370433e9abf5a2cb51810202 (diff)
downloadbcm5719-llvm-6993abff141af670e8d9413d539ed6fffabf492a.tar.gz
bcm5719-llvm-6993abff141af670e8d9413d539ed6fffabf492a.zip
Revert "Fix bug with register values byte order in expression evaluation."
This reverts commit r262041, which caused asserts starting yesterday on the OS X testbot. See details in: https://llvm.org/bugs/show_bug.cgi?id=26758 llvm-svn: 262156
-rw-r--r--lldb/source/Expression/Materializer.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/lldb/source/Expression/Materializer.cpp b/lldb/source/Expression/Materializer.cpp
index e95ee31f26e..1aa93a76c9f 100644
--- a/lldb/source/Expression/Materializer.cpp
+++ b/lldb/source/Expression/Materializer.cpp
@@ -26,7 +26,6 @@
#include "lldb/Target/StackFrame.h"
#include "lldb/Target/Target.h"
#include "lldb/Target/Thread.h"
-#include "lldb/Utility/LLDBAssert.h"
using namespace lldb_private;
@@ -1276,15 +1275,9 @@ public:
m_register_contents.reset(new DataBufferHeap(register_data.GetDataStart(), register_data.GetByteSize()));
Error write_error;
-
- Scalar scalar;
- if (reg_value.GetScalarValue(scalar)) {
- lldbassert(scalar.GetByteSize() == register_data.GetByteSize());
- map.WriteScalarToMemory(load_addr, scalar, scalar.GetByteSize(), write_error);
- } else {
- map.WriteMemory(load_addr, register_data.GetDataStart(), register_data.GetByteSize(), write_error);
- }
-
+
+ map.WriteMemory(load_addr, register_data.GetDataStart(), register_data.GetByteSize(), write_error);
+
if (!write_error.Success())
{
err.SetErrorStringWithFormat("couldn't write the contents of register %s: %s", m_register_info.name, write_error.AsCString());
OpenPOWER on IntegriCloud