diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-11 19:49:03 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-11 19:49:03 -0500 |
| commit | 346fe0c4c0b88f11a3d0c01c34d9a170d73429cc (patch) | |
| tree | 699be308892b0a9c1f31d8025c092a99f3418b00 /target-arm/helper.c | |
| parent | 53810bab3acd73b9844807e53f02d867c1ad1d2a (diff) | |
| parent | b90372ad2a69a9cdad2a40766eb46f0a89d98535 (diff) | |
| download | focaccia-qemu-346fe0c4c0b88f11a3d0c01c34d9a170d73429cc.tar.gz focaccia-qemu-346fe0c4c0b88f11a3d0c01c34d9a170d73429cc.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: target-arm: Fix typos in comments arm: translate: comment typo - s/middel/middle/ vl.c: Exit QEMU early if no machine is found
Diffstat (limited to 'target-arm/helper.c')
| -rw-r--r-- | target-arm/helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index 5727da296c..dceaa95c80 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -988,7 +988,7 @@ static void ttbr164_reset(CPUARMState *env, const ARMCPRegInfo *ri) } static const ARMCPRegInfo lpae_cp_reginfo[] = { - /* NOP AMAIR0/1: the override is because these clash with tha rather + /* NOP AMAIR0/1: the override is because these clash with the rather * broadly specified TLB_LOCKDOWN entry in the generic cp_reginfo. */ { .name = "AMAIR0", .cp = 15, .crn = 10, .crm = 3, .opc1 = 0, .opc2 = 0, @@ -2899,8 +2899,8 @@ uint32_t HELPER(logicq_cc)(uint64_t val) return (val >> 32) | (val != 0); } -/* VFP support. We follow the convention used for VFP instrunctions: - Single precition routines have a "s" suffix, double precision a +/* VFP support. We follow the convention used for VFP instructions: + Single precision routines have a "s" suffix, double precision a "d" suffix. */ /* Convert host exception flags to vfp form. */ |