Fixup TestRegisters after r246955

- clang is picky about inline assembly: add the correct instruction size suffix
- mark the new test as expectedFailureClang: the test fails as the breakpoint is set in the wrong
  place

llvm-svn: 246957

2 files changed, 18 insertions, 16 deletions

diff --git a/lldb/test/functionalities/register/TestRegisters.py b/lldb/test/functionalities/register/TestRegisters.py
index 8abb5c642e6..30c8b5305d2 100755
--- a/lldb/test/functionalities/register/TestRegisters.py
+++ b/lldb/test/functionalities/register/TestRegisters.py
@@ -35,6 +35,7 @@ class RegisterCommandsTestCase(TestBase):
         self.buildDefault()
         self.fp_register_write()
 
+    @expectedFailureClang("llvm.org/pr24733")
     def test_fp_special_purpose_register_read(self):
         """Test commands that read fpu special purpose registers."""
         if not self.getArchitecture() in ['amd64', 'i386', 'x86_64']:
diff --git a/lldb/test/functionalities/register/a.cpp b/lldb/test/functionalities/register/a.cpp
index 7be6875fc05..587ccac3418 100755
--- a/lldb/test/functionalities/register/a.cpp
+++ b/lldb/test/functionalities/register/a.cpp
@@ -11,30 +11,31 @@
 long double
 return_long_double (long double value)
 {
-  float a=2, b=4,c=8, d=16, e=32, f=64, k=128, l=256, add=0;
-__asm__ ( "fld %1 ;"
-	"fld %2 ;"
-	"fld %3 ;"
-	"fld %4 ;"
-	"fld %5 ;"
-	"fld %6 ;"
-	"fld %7 ;"
-	"fadd ;" : "=g" (add) : "g" (a), "g" (b), "g" (c), "g" (d), "g" (e), "g" (f), "g" (k), "g" (l) );  // Set break point at this line.
-  return value;
+    float a=2, b=4,c=8, d=16, e=32, f=64, k=128, l=256, add=0;
+    __asm__ (
+        "flds %1 ;"
+        "flds %2 ;"
+        "flds %3 ;"
+        "flds %4 ;"
+        "flds %5 ;"
+        "flds %6 ;"
+        "flds %7 ;"
+        "faddp ;" : "=g" (add) : "g" (a), "g" (b), "g" (c), "g" (d), "g" (e), "g" (f), "g" (k), "g" (l) );  // Set break point at this line.
+    return value;
 }
 
 long double
 outer_return_long_double (long double value)
 {
-  long double val = return_long_double(value);
-  val *= 2 ;
-  return val;
+    long double val = return_long_double(value);
+    val *= 2 ;
+    return val;
 }
 
 long double
 outermost_return_long_double (long double value)
 {
-  long double val = outer_return_long_double(value);
-  val *= 2 ;
-  return val;
+    long double val = outer_return_long_double(value);
+    val *= 2 ;
+    return val;
 }