diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2013-04-13 13:50:34 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-04-13 13:50:34 +0200 |
| commit | 396a14a3be17edbcdf33ad2c94d6e1069464f9e0 (patch) | |
| tree | 5a094259c3450e656a061d61fc980f3b93881d25 /target-s390x | |
| parent | 0a9c2341de2e735166084538d000ed80182ff404 (diff) | |
| parent | c30d1aea1478cd55e8cfdf866afa39cd00bb4ea1 (diff) | |
| download | qemu-396a14a3be17edbcdf33ad2c94d6e1069464f9e0.zip qemu-396a14a3be17edbcdf33ad2c94d6e1069464f9e0.tar.gz qemu-396a14a3be17edbcdf33ad2c94d6e1069464f9e0.tar.bz2 | |
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu:
cpu-exec: Allow "-d exec" in non-debug builds (drop CONFIG_DEBUG_EXEC)
Typo, spelling and grammatical fixes
linux-user: pass correct host flags to eventfd2 call
target-moxie: Fix VMState registration
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/mem_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 372334b..02bc432 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -344,7 +344,7 @@ uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end, env->retxl = str; /* Lest we fail to service interrupts in a timely manner, limit the - amount of work we're willing to do. For now, lets cap at 8k. */ + amount of work we're willing to do. For now, let's cap at 8k. */ for (len = 0; len < 0x2000; ++len) { if (str + len == end) { /* Character not found. R1 & R2 are unmodified. */ @@ -375,7 +375,7 @@ uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c, uint64_t s1, uint64_t s2) s2 = fix_address(env, s2); /* Lest we fail to service interrupts in a timely manner, limit the - amount of work we're willing to do. For now, lets cap at 8k. */ + amount of work we're willing to do. For now, let's cap at 8k. */ for (len = 0; len < 0x2000; ++len) { uint8_t v1 = cpu_ldub_data(env, s1 + len); uint8_t v2 = cpu_ldub_data(env, s2 + len); @@ -424,7 +424,7 @@ uint64_t HELPER(mvst)(CPUS390XState *env, uint64_t c, uint64_t d, uint64_t s) s = fix_address(env, s); /* Lest we fail to service interrupts in a timely manner, limit the - amount of work we're willing to do. For now, lets cap at 8k. */ + amount of work we're willing to do. For now, let's cap at 8k. */ for (len = 0; len < 0x2000; ++len) { uint8_t v = cpu_ldub_data(env, s + len); cpu_stb_data(env, d + len, v); @@ -708,7 +708,7 @@ uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1, uint64_t cksm = (uint32_t)r1; /* Lest we fail to service interrupts in a timely manner, limit the - amount of work we're willing to do. For now, lets cap at 8k. */ + amount of work we're willing to do. For now, let's cap at 8k. */ max_len = (src_len > 0x2000 ? 0x2000 : src_len); /* Process full words as available. */ |