diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2015-09-07 15:30:36 +0200 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2015-09-07 15:30:36 +0200 |
| commit | e2b4dd77dec4e3f471b59336ef99b1151638ad38 (patch) | |
| tree | 0cb718588748b2aa94bdab527038904c78421213 | |
| parent | ce99e244faff3cae27b2e3511febd8bdc5bd0e03 (diff) | |
executor: fix load of parameters smaller than 64 bitsrhel-7.2
Parameters less than 64 bits are passed in just one param register.
Fixes crashes on ldresnearb and friends in emulated code.
| -rw-r--r-- | orc/orcexecutor.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/orc/orcexecutor.c b/orc/orcexecutor.c index 6fe296d..6306d34 100644 --- a/orc/orcexecutor.c +++ b/orc/orcexecutor.c @@ -295,10 +295,15 @@ orc_executor_emulate (OrcExecutor *ex) } else if (var->vartype == ORC_VAR_TYPE_PARAM) { opcode_ex[j].src_ptrs[k] = tmpspace[insn->src_args[k]]; /* FIXME hack */ - load_constant (tmpspace[insn->src_args[k]], 8, - (orc_uint64)(orc_uint32)ex->params[insn->src_args[k]] | - (((orc_uint64)(orc_uint32)ex->params[insn->src_args[k] + - (ORC_VAR_T1 - ORC_VAR_P1)])<<32)); + if (var->size == 8) { + load_constant (tmpspace[insn->src_args[k]], 8, + (orc_uint64)(orc_uint32)ex->params[insn->src_args[k]] | + (((orc_uint64)(orc_uint32)ex->params[insn->src_args[k] + + (ORC_VAR_T1 - ORC_VAR_P1)])<<32)); + } else { + load_constant (tmpspace[insn->src_args[k]], 8, + ex->params[insn->src_args[k]]); + } } else if (var->vartype == ORC_VAR_TYPE_TEMP) { opcode_ex[j].src_ptrs[k] = tmpspace[insn->src_args[k]]; } else if (var->vartype == ORC_VAR_TYPE_SRC) { |