diff options
| author | Peter Maydell | 2017-02-14 10:55:48 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-14 10:55:48 +0100 |
| commit | 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58 (patch) | |
| tree | a9e193d020dbfa96afeb2aa9f08442554b415f26 /linux-user/openrisc | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170213a'... (diff) | |
| parent | target/openrisc: Optimize for r0 being zero (diff) | |
| download | qemu-5dae13cd71f0755a1395b5a4cde635b8a6ee3f58.tar.gz qemu-5dae13cd71f0755a1395b5a4cde635b8a6ee3f58.tar.xz qemu-5dae13cd71f0755a1395b5a4cde635b8a6ee3f58.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging
Queued openrisc patches
# gpg: Signature made Mon 13 Feb 2017 21:21:03 GMT
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-or-20170214: (24 commits)
target/openrisc: Optimize for r0 being zero
target/openrisc: Tidy handling of delayed branches
target/openrisc: Tidy ppc/npc implementation
target/openrisc: Optimize l.jal to next
target/openrisc: Fix madd
target/openrisc: Implement muld, muldu, macu, msbu
target/openrisc: Represent MACHI:MACLO as a single unit
target/openrisc: Implement msync
target/openrisc: Enable trap, csync, msync, psync for user mode
target/openrisc: Set flags on helpers
target/openrisc: Use movcond where appropriate
target/openrisc: Keep SR_CY and SR_OV in a separate variables
target/openrisc: Keep SR_F in a separate variable
target/openrisc: Invert the decoding in dec_calc
target/openrisc: Put SR[OVE] in TB flags
target/openrisc: Streamline arithmetic and OVE
target/openrisc: Rationalize immediate extraction
target/openrisc: Tidy insn dumping
target/openrisc: Implement lwa, swa
target/openrisc: Fix exception handling status registers
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/openrisc')
| -rw-r--r-- | linux-user/openrisc/target_cpu.h | 4 | ||||
| -rw-r--r-- | linux-user/openrisc/target_syscall.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux-user/openrisc/target_cpu.h b/linux-user/openrisc/target_cpu.h index a21ed1aff8..f283d96a93 100644 --- a/linux-user/openrisc/target_cpu.h +++ b/linux-user/openrisc/target_cpu.h @@ -30,9 +30,7 @@ static inline void cpu_clone_regs(CPUOpenRISCState *env, target_ulong newsp) static inline void cpu_set_tls(CPUOpenRISCState *env, target_ulong newtls) { - /* Linux kernel 3.10 does not pay any attention to CLONE_SETTLS - * in copy_thread(), so QEMU need not do so either. - */ + env->gpr[10] = newtls; } #endif diff --git a/linux-user/openrisc/target_syscall.h b/linux-user/openrisc/target_syscall.h index 9d3380f9a8..03104f80af 100644 --- a/linux-user/openrisc/target_syscall.h +++ b/linux-user/openrisc/target_syscall.h @@ -31,4 +31,6 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 +#define MMAP_SHIFT TARGET_PAGE_BITS + #endif /* OPENRISC_TARGET_SYSCALL_H */ |