aboutsummaryrefslogtreecommitdiff
path: root/target-microblaze
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-05-12 08:08:12 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-05-12 08:08:12 -0500
commit711c21280b2cb56060859cc574221a8bf40f908a (patch)
tree9f5385c53ac50e613ae34d4165d02460ef993f0f /target-microblaze
parent89bb563f6912b3f538d6bdf5833881ed7cdbd923 (diff)
parent2f172849b63b166fe876aa97b411f63ee7d17467 (diff)
downloadqemu-711c21280b2cb56060859cc574221a8bf40f908a.zip
qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.gz
qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.bz2
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts: cpu-all.h
Diffstat (limited to 'target-microblaze')
-rw-r--r--target-microblaze/helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c
index 5230b52..a623c7b 100644
--- a/target-microblaze/helper.c
+++ b/target-microblaze/helper.c
@@ -117,7 +117,7 @@ void do_interrupt(CPUState *env)
{
uint32_t t;
- /* IMM flag cannot propagate accross a branch and into the dslot. */
+ /* IMM flag cannot propagate across a branch and into the dslot. */
assert(!((env->iflags & D_FLAG) && (env->iflags & IMM_FLAG)));
assert(!(env->iflags & (DRTI_FLAG | DRTE_FLAG | DRTB_FLAG)));
/* assert(env->sregs[SR_MSR] & (MSR_EE)); Only for HW exceptions. */