[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 254/437: ARM: Correct build when disassembler is disable
From: |
Andy Wingo |
Subject: |
[Guile-commits] 254/437: ARM: Correct build when disassembler is disabled. |
Date: |
Mon, 2 Jul 2018 05:14:31 -0400 (EDT) |
wingo pushed a commit to branch lightning
in repository guile.
commit 0ad5e08ee5e60abeadeefb106c69590a17664b8a
Author: pcpa <address@hidden>
Date: Fri Sep 27 13:19:49 2013 -0300
ARM: Correct build when disassembler is disabled.
---
ChangeLog | 5 +++++
lib/jit_arm.c | 13 ++++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 034cb07..533fb67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-27 Paulo Andrade <address@hidden>
+
+ * lib/jit_arm.c: Correct build when disassembler is
+ disabled.
+
2013-10-25 Paulo Andrade <address@hidden>
* lib/jit_ia64-cpu.c, lib/jit_ia64-fpu.c: Correct some
diff --git a/lib/jit_arm.c b/lib/jit_arm.c
index 9dd97f6..86435bc 100644
--- a/lib/jit_arm.c
+++ b/lib/jit_arm.c
@@ -803,7 +803,9 @@ _emit_code(jit_state_t *_jit)
jit_uint8_t *data;
jit_word_t word;
jit_uword_t thumb;
+#if DISASSEMBLER
jit_int32_t info_offset;
+#endif
jit_int32_t const_offset;
jit_int32_t patch_offset;
} undo;
@@ -817,7 +819,10 @@ _emit_code(jit_state_t *_jit)
undo.node = NULL;
undo.data = NULL;
undo.thumb = 0;
- undo.info_offset = undo.const_offset = undo.patch_offset = 0;
+#if DISASSEMBLER
+ undo.info_offset =
+#endif
+ undo.const_offset = undo.patch_offset = 0;
# define assert_data(node) /**/
#define case_rr(name, type) \
case jit_code_##name##r##type: \
@@ -1413,8 +1418,10 @@ _emit_code(jit_state_t *_jit)
undo.thumb = _jitc->thumb;
undo.const_offset = _jitc->consts.offset;
undo.patch_offset = _jitc->patches.offset;
+#if DISASSEMBLER
if (_jitc->data_info.ptr)
undo.info_offset = _jitc->data_info.offset;
+#endif
restart_function:
_jitc->again = 0;
prolog(node);
@@ -1436,8 +1443,10 @@ _emit_code(jit_state_t *_jit)
_jitc->thumb = undo.thumb;
_jitc->consts.offset = undo.const_offset;
_jitc->patches.offset = undo.patch_offset;
+#if DISASSEMBLER
if (_jitc->data_info.ptr)
_jitc->data_info.offset = undo.info_offset;
+#endif
goto restart_function;
}
/* remember label is defined */
@@ -1738,6 +1747,7 @@ _flush_consts(jit_state_t *_jit)
memcpy(_jitc->consts.data, _jitc->consts.values, _jitc->consts.size);
_jit->pc.w += _jitc->consts.size;
+#if DISASSEMBLER
if (_jitc->data_info.ptr) {
if (_jitc->data_info.offset >= _jitc->data_info.length) {
jit_realloc((jit_pointer_t *)&_jitc->data_info.ptr,
@@ -1750,6 +1760,7 @@ _flush_consts(jit_state_t *_jit)
_jitc->data_info.ptr[_jitc->data_info.offset].length =
_jitc->consts.size;
++_jitc->data_info.offset;
}
+#endif
for (offset = 0; offset < _jitc->consts.offset; offset += 2)
patch_at(arm_patch_load, _jitc->consts.patches[offset],
- [Guile-commits] 256/437: X86: %r12 may be used as an index register., (continued)
- [Guile-commits] 256/437: X86: %r12 may be used as an index register., Andy Wingo, 2018/07/02
- [Guile-commits] 229/437: Do not assume cast of nan or inf double to float always work., Andy Wingo, 2018/07/02
- [Guile-commits] 231/437: Cosmetic removal of white spaces in end of lines., Andy Wingo, 2018/07/02
- [Guile-commits] 232/437: Correct off by one bug on s390x subi., Andy Wingo, 2018/07/02
- [Guile-commits] 123/437: Revert change aliasing jit_movi_p to jit_movi_ul., Andy Wingo, 2018/07/02
- [Guile-commits] 248/437: Correct wrong example and mt unsafe code in the arm backend., Andy Wingo, 2018/07/02
- [Guile-commits] 236/437: Correct build and make check on gcc111 - AIX 7.1., Andy Wingo, 2018/07/02
- [Guile-commits] 237/437: Correct build and check on NetBSD amd64., Andy Wingo, 2018/07/02
- [Guile-commits] 213/437: Finish Itanium port, correcting remaining failing test cases., Andy Wingo, 2018/07/02
- [Guile-commits] 253/437: IA64: Correct some wrong checks value range checks., Andy Wingo, 2018/07/02
- [Guile-commits] 254/437: ARM: Correct build when disassembler is disabled.,
Andy Wingo <=
- [Guile-commits] 251/437: Add code to calculate code buffer size based on devel time information., Andy Wingo, 2018/07/02
- [Guile-commits] 144/437: Add new ldst variant test cases to check base/index register clobber., Andy Wingo, 2018/07/02
- [Guile-commits] 212/437: Correct remaining test cases, but not yet ones with stack arguments., Andy Wingo, 2018/07/02
- [Guile-commits] 179/437: Add heuristic code to estimate space and resize if required jit buffer., Andy Wingo, 2018/07/02
- [Guile-commits] 265/437: PPC: Correct wrong ldxi_l simplification in 64 bit mode, Andy Wingo, 2018/07/02
- [Guile-commits] 155/437: Add support to test different/alternate code generation setups., Andy Wingo, 2018/07/02
- [Guile-commits] 241/437: Add fallback logic instead of error if cannot figure __WORDSIZE., Andy Wingo, 2018/07/02
- [Guile-commits] 220/437: Update ia64 port to work on HP-UX., Andy Wingo, 2018/07/02
- [Guile-commits] 247/437: Add the jit_callee_save_p interface and extra register definitions., Andy Wingo, 2018/07/02
- [Guile-commits] 259/437: Correct wrong dates in ChangeLog, Andy Wingo, 2018/07/02