diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-11-30 14:11:48 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-11-30 14:11:58 +0900 |
| commit | 2371603ef207b015cc29728296b21cb1722d8ae6 (patch) | |
| tree | 25cbb62daf29066fa874b9a4b8f754bc18187806 /disas/alpha.c | |
| parent | d5df306aedcc13cf5a2463ddf858c8d718a788d5 (diff) | |
| parent | d4dcb59384ab4433702f015fdddda1eff8e3927f (diff) | |
| download | qemu-2371603ef207b015cc29728296b21cb1722d8ae6.tar.gz qemu-2371603ef207b015cc29728296b21cb1722d8ae6.tar.bz2 qemu-2371603ef207b015cc29728296b21cb1722d8ae6.zip | |
Merge branch 'develop_qemu_2.7' into develop
Change-Id: Ibae70e3c0d1d88632903f98be114f47af9ca7502
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'disas/alpha.c')
| -rw-r--r-- | disas/alpha.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/disas/alpha.c b/disas/alpha.c index 44d00a3635..b7b0ae0d92 100644 --- a/disas/alpha.c +++ b/disas/alpha.c @@ -521,7 +521,7 @@ static unsigned insert_bdisp(unsigned insn, int value, const char **errmsg) { if (errmsg != (const char **)NULL && (value & 3)) - *errmsg = _("branch operand unaligned"); + *errmsg = "branch operand unaligned"; return insn | ((value / 4) & 0x1FFFFF); } @@ -539,7 +539,7 @@ static unsigned insert_jhint(unsigned insn, int value, const char **errmsg) { if (errmsg != (const char **)NULL && (value & 3)) - *errmsg = _("jump hint unaligned"); + *errmsg = "jump hint unaligned"; return insn | ((value / 4) & 0x3FFF); } @@ -556,7 +556,7 @@ static unsigned insert_ev6hwjhint(unsigned insn, int value, const char **errmsg) { if (errmsg != (const char **)NULL && (value & 3)) - *errmsg = _("jump hint unaligned"); + *errmsg = "jump hint unaligned"; return insn | ((value / 4) & 0x1FFF); } |