pull-loongarch-20230404
-----BEGIN PGP SIGNATURE----- iLMEAAEIAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZCwLXQAKCRBAov/yOSY+ 3zwUA/9d2ddHxGEBTMyF45bzc9JxRF6HoILAwMLsmPWqspPgKdGuviMVewJLt5m8 V75/BC6Sn9rhdkXALvZMRV6WQ2A16pByUaQtMYAXVsIoV8Mrpvm4GwJD1E0/cy5Q TwDTzpDfys9WsTVj0QlCPjp0JW+KA7Y6ArMUUCdCz41L2r7mPA== =ovw7 -----END PGP SIGNATURE----- Merge tag 'pull-loongarch-20230404' of https://gitlab.com/gaosong/qemu into staging pull-loongarch-20230404 # -----BEGIN PGP SIGNATURE----- # # iLMEAAEIAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZCwLXQAKCRBAov/yOSY+ # 3zwUA/9d2ddHxGEBTMyF45bzc9JxRF6HoILAwMLsmPWqspPgKdGuviMVewJLt5m8 # V75/BC6Sn9rhdkXALvZMRV6WQ2A16pByUaQtMYAXVsIoV8Mrpvm4GwJD1E0/cy5Q # TwDTzpDfys9WsTVj0QlCPjp0JW+KA7Y6ArMUUCdCz41L2r7mPA== # =ovw7 # -----END PGP SIGNATURE----- # gpg: Signature made Tue 04 Apr 2023 12:34:53 BST # gpg: using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF # gpg: Good signature from "Song Gao <m17746591750@163.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B8FF 1DA0 D2FD CB2D A09C 6C2C 40A2 FFF2 3926 3EDF * tag 'pull-loongarch-20230404' of https://gitlab.com/gaosong/qemu: target/loongarch: Enables plugins to get instruction codes hw/loongarch/virt: Fix virt_to_phys_addr function Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
4584e76c9a
|
@ -399,7 +399,7 @@ static struct _loaderparams {
|
||||||
|
|
||||||
static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
|
static uint64_t cpu_loongarch_virt_to_phys(void *opaque, uint64_t addr)
|
||||||
{
|
{
|
||||||
return addr & 0x1fffffffll;
|
return addr & MAKE_64BIT_MASK(0, TARGET_PHYS_ADDR_SPACE_BITS);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int64_t load_kernel_info(void)
|
static int64_t load_kernel_info(void)
|
||||||
|
|
|
@ -177,7 +177,7 @@ static void loongarch_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs)
|
||||||
CPULoongArchState *env = cs->env_ptr;
|
CPULoongArchState *env = cs->env_ptr;
|
||||||
DisasContext *ctx = container_of(dcbase, DisasContext, base);
|
DisasContext *ctx = container_of(dcbase, DisasContext, base);
|
||||||
|
|
||||||
ctx->opcode = cpu_ldl_code(env, ctx->base.pc_next);
|
ctx->opcode = translator_ldl(env, &ctx->base, ctx->base.pc_next);
|
||||||
|
|
||||||
if (!decode(ctx, ctx->opcode)) {
|
if (!decode(ctx, ctx->opcode)) {
|
||||||
qemu_log_mask(LOG_UNIMP, "Error: unknown opcode. "
|
qemu_log_mask(LOG_UNIMP, "Error: unknown opcode. "
|
||||||
|
|
Loading…
Reference in New Issue