diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-12 08:08:12 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-05-12 08:08:12 -0500 |
| commit | 711c21280b2cb56060859cc574221a8bf40f908a (patch) | |
| tree | 9f5385c53ac50e613ae34d4165d02460ef993f0f /target-cris | |
| parent | 89bb563f6912b3f538d6bdf5833881ed7cdbd923 (diff) | |
| parent | 2f172849b63b166fe876aa97b411f63ee7d17467 (diff) | |
| download | qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.gz qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.bz2 qemu-711c21280b2cb56060859cc574221a8bf40f908a.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts:
cpu-all.h
Diffstat (limited to 'target-cris')
| -rw-r--r-- | target-cris/cpu.h | 2 | ||||
| -rw-r--r-- | target-cris/translate_v10.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 8686dbaf2e..2bc35e4975 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -104,7 +104,7 @@ typedef struct CPUCRISState { /* P0 - P15 are referred to as special registers in the docs. */ uint32_t pregs[16]; - /* Pseudo register for the PC. Not directly accessable on CRIS. */ + /* Pseudo register for the PC. Not directly accessible on CRIS. */ uint32_t pc; /* Pseudo register for the kernel stack. */ diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c index 41db158965..5b14157d1a 100644 --- a/target-cris/translate_v10.c +++ b/target-cris/translate_v10.c @@ -956,7 +956,7 @@ static int dec10_bdap_m(DisasContext *dc, int size) return insn_len; } #endif - /* Now the rest of the modes are truely indirect. */ + /* Now the rest of the modes are truly indirect. */ insn_len += dec10_prep_move_m(dc, 1, size, cpu_PR[PR_PREFIX]); tcg_gen_add_tl(cpu_PR[PR_PREFIX], cpu_PR[PR_PREFIX], cpu_R[rd]); cris_set_prefix(dc); |