[Guile-commits] 298/437: ARM: Correct wrong table of instruction sizes in software float

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit a597e3575d42841078b6ad8a1f97e0282c803b08
Author: pcpa <address@hidden>
Date:   Sat Aug 16 20:08:07 2014 -0300

    ARM: Correct wrong table of instruction sizes in software float
    
        * lib/jit_arm-sz.c: Regenerate table of known maximum
        instruction sizes for the software float fallback,
        that implements "virtual" float registers in the stack
        and operations as calls to libgcc.
    
        * size.c: Correct typo in the generated jit_arm-sz.c file.
---
 ChangeLog        |   9 ++
 lib/jit_arm-sz.c | 282 +++++++++++++++++++++++++++----------------------------
 size.c           |   2 +-
 3 files changed, 151 insertions(+), 142 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3c7cc0..9245033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-16 Paulo Andrade <address@hidden>
+
+       * lib/jit_arm-sz.c: Regenerate table of known maximum
+       instruction sizes for the software float fallback,
+       that implements "virtual" float registers in the stack
+       and operations as calls to libgcc.
+
+       * size.c: Correct typo in the generated jit_arm-sz.c file.
+
 2014-08-10 Paulo Andrade <address@hidden>
 
         * include/lightning/jit_alpha.h, lib/jit_alpha-cpu.c,
diff --git a/lib/jit_arm-sz.c b/lib/jit_arm-sz.c
index df3ca3e..db7751e 100644
--- a/lib/jit_arm-sz.c
+++ b/lib/jit_arm-sz.c
@@ -353,7 +353,7 @@
 
 #if __WORDSIZE == 32
 #if !defined(__ARM_PCS_VFP)
-#define JIT_INSTR_MAX 74
+#define JIT_INSTR_MAX 90
     0,
     0,
     0,
@@ -381,18 +381,18 @@
     12,
     4,
     8,
-    32,
+    40,
+    44,
+    40,
+    44,
+    34,
+    38,
+    34,
+    38,
+    40,
+    44,
+    40,
     44,
-    24,
-    28,
-    18,
-    22,
-    18,
-    22,
-    24,
-    28,
-    24,
-    28,
     4,
     4,
     4,
@@ -526,49 +526,49 @@
     12,
     12,
     0,
-    22,
-    22,
-    22,
-    22,
-    22,
-    22,
-    22,
-    22,
+    38,
+    38,
+    38,
+    38,
+    38,
+    38,
+    38,
+    38,
     12,
     12,
-    18,
-    20,
-    30,
-    20,
+    34,
+    36,
+    40,
+    36,
+    40,
+    36,
+    40,
+    36,
+    40,
+    36,
+    40,
+    40,
+    44,
+    66,
+    74,
+    66,
+    74,
+    66,
+    74,
+    66,
+    74,
+    66,
+    74,
+    70,
+    78,
+    40,
+    44,
+    66,
+    74,
     32,
-    20,
-    30,
-    20,
-    30,
-    20,
-    30,
-    24,
-    30,
-    50,
-    58,
-    50,
-    58,
-    50,
-    58,
-    50,
-    58,
-    50,
-    58,
-    54,
-    62,
-    24,
-    30,
-    50,
-    58,
-    16,
     0,
     32,
-    22,
+    38,
     8,
     12,
     8,
@@ -579,78 +579,78 @@
     16,
     8,
     8,
-    24,
-    24,
-    24,
-    28,
-    24,
+    40,
+    40,
+    40,
     44,
-    24,
-    28,
-    24,
-    28,
-    24,
-    28,
-    24,
-    28,
-    24,
-    28,
+    40,
+    44,
+    40,
+    44,
+    40,
+    44,
+    40,
+    44,
+    40,
+    44,
+    40,
+    44,
+    68,
+    76,
+    40,
+    44,
+    40,
+    44,
+    68,
+    76,
+    40,
+    44,
+    40,
+    44,
+    0,
+    50,
     52,
-    60,
-    24,
-    28,
-    24,
-    28,
+    50,
+    52,
+    50,
+    52,
+    50,
     52,
-    60,
-    24,
-    28,
-    24,
-    28,
-    0,
-    34,
-    36,
-    34,
-    36,
-    34,
-    36,
-    34,
-    36,
     20,
     20,
-    26,
-    28,
-    34,
-    28,
+    42,
+    44,
+    46,
+    44,
+    46,
+    44,
+    46,
+    44,
+    46,
+    44,
+    46,
+    48,
+    50,
+    82,
+    86,
+    82,
+    86,
+    82,
+    86,
+    82,
+    86,
+    82,
+    86,
+    86,
+    90,
+    48,
+    50,
+    82,
+    86,
     36,
-    28,
-    34,
-    28,
-    34,
-    28,
-    34,
-    32,
-    34,
-    66,
-    70,
-    66,
-    70,
-    66,
-    70,
-    66,
-    70,
-    66,
-    70,
-    70,
-    74,
-    32,
-    34,
-    66,
-    70,
-    20,
     0,
     36,
-    22,
+    38,
     16,
     20,
     16,
@@ -661,34 +661,34 @@
     24,
     20,
     16,
-    32,
-    34,
-    32,
-    34,
-    32,
+    48,
+    50,
+    48,
+    50,
+    48,
+    50,
+    48,
+    50,
+    48,
+    50,
+    48,
+    50,
+    48,
+    50,
+    48,
+    50,
+    84,
+    88,
+    48,
+    50,
+    48,
+    50,
+    84,
+    88,
+    48,
+    50,
+    48,
     50,
-    32,
-    34,
-    32,
-    34,
-    32,
-    34,
-    32,
-    34,
-    32,
-    34,
-    68,
-    72,
-    32,
-    34,
-    32,
-    34,
-    68,
-    72,
-    32,
-    34,
-    32,
-    34,
     4,
     8,
     0,
diff --git a/size.c b/size.c
index 9ea3468..6d2ca56 100644
--- a/size.c
+++ b/size.c
@@ -71,7 +71,7 @@ main(int argc, char *argv[])
     for (offset = 0; offset <= jit_code_x86_retval_d; offset++)
        fprintf(fp, "    %d,\n", _szs[offset]);
 #if defined(__arm__)
-    fprintf(fp, "#undef /* __ARM_PCS_VFP */\n");
+    fprintf(fp, "#endif /* __ARM_PCS_VFP */\n");
 #elif defined(__mips__)
 #  if __WORDSIZE == 32
     fprintf(fp, "#endif /* NEW_ABI */\n");