haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

xtensa: avoid "naked" qemu_log

Browse source 
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-11-13 13:43:35 +01:00
parent b81b971c7a
commit c30f0d182f
5 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target-xtensa/gdbstub.c
View file

@ -63,8 +63,8 @@ int xtensa_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
return gdb_get_reg32(mem_buf, env->regs[reg->targno & 0x0f]); return gdb_get_reg32(mem_buf, env->regs[reg->targno & 0x0f]);
default: default:
qemu_log("%s from reg %d of unsupported type %d\n", qemu_log_mask(LOG_UNIMP, "%s from reg %d of unsupported type %d\n",
__func__, n, reg->type); __func__, n, reg->type);
return 0; return 0;
} }
} }
@ -117,8 +117,8 @@ int xtensa_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
break; break;
default: default:
qemu_log("%s to reg %d of unsupported type %d\n", qemu_log_mask(LOG_UNIMP, "%s to reg %d of unsupported type %d\n",
__func__, n, reg->type); __func__, n, reg->type);
return 0; return 0;
} }

4
target-xtensa/helper.c
View file

@ -254,8 +254,8 @@ void xtensa_cpu_do_interrupt(CPUState *cs)
env->config->exception_vector[cs->exception_index]); env->config->exception_vector[cs->exception_index]);
env->exception_taken = 1; env->exception_taken = 1;
} else { } else {
qemu_log("%s(pc = %08x) bad exception_index: %d\n", qemu_log_mask(CPU_LOG_INT, "%s(pc = %08x) bad exception_index: %d\n",
__func__, env->pc, cs->exception_index); __func__, env->pc, cs->exception_index);
} }
break; break;

20
target-xtensa/op_helper.c
View file

@ -245,8 +245,8 @@ void HELPER(entry)(CPUXtensaState *env, uint32_t pc, uint32_t s, uint32_t imm)
{ {
int callinc = (env->sregs[PS] & PS_CALLINC) >> PS_CALLINC_SHIFT; int callinc = (env->sregs[PS] & PS_CALLINC) >> PS_CALLINC_SHIFT;
if (s > 3 || ((env->sregs[PS] & (PS_WOE | PS_EXCM)) ^ PS_WOE) != 0) { if (s > 3 || ((env->sregs[PS] & (PS_WOE | PS_EXCM)) ^ PS_WOE) != 0) {
qemu_log("Illegal entry instruction(pc = %08x), PS = %08x\n", qemu_log_mask(LOG_GUEST_ERROR, "Illegal entry instruction(pc = %08x), PS = %08x\n",
pc, env->sregs[PS]); pc, env->sregs[PS]);
HELPER(exception_cause)(env, pc, ILLEGAL_INSTRUCTION_CAUSE); HELPER(exception_cause)(env, pc, ILLEGAL_INSTRUCTION_CAUSE);
} else { } else {
uint32_t windowstart = xtensa_replicate_windowstart(env) >> uint32_t windowstart = xtensa_replicate_windowstart(env) >>
@ -307,9 +307,9 @@ uint32_t HELPER(retw)(CPUXtensaState *env, uint32_t pc)
if (n == 0 || (m != 0 && m != n) || if (n == 0 || (m != 0 && m != n) ||
((env->sregs[PS] & (PS_WOE | PS_EXCM)) ^ PS_WOE) != 0) { ((env->sregs[PS] & (PS_WOE | PS_EXCM)) ^ PS_WOE) != 0) {
qemu_log("Illegal retw instruction(pc = %08x), " qemu_log_mask(LOG_GUEST_ERROR, "Illegal retw instruction(pc = %08x), "
"PS = %08x, m = %d, n = %d\n", "PS = %08x, m = %d, n = %d\n",
pc, env->sregs[PS], m, n); pc, env->sregs[PS], m, n);
HELPER(exception_cause)(env, pc, ILLEGAL_INSTRUCTION_CAUSE); HELPER(exception_cause)(env, pc, ILLEGAL_INSTRUCTION_CAUSE);
} else { } else {
int owb = windowbase; int owb = windowbase;
@ -743,8 +743,8 @@ void xtensa_tlb_set_entry(CPUXtensaState *env, bool dtlb,
xtensa_tlb_set_entry_mmu(env, entry, dtlb, wi, ei, vpn, pte); xtensa_tlb_set_entry_mmu(env, entry, dtlb, wi, ei, vpn, pte);
tlb_flush_page(cs, entry->vaddr); tlb_flush_page(cs, entry->vaddr);
} else { } else {
qemu_log("%s %d, %d, %d trying to set immutable entry\n", qemu_log_mask(LOG_GUEST_ERROR, "%s %d, %d, %d trying to set immutable entry\n",
__func__, dtlb, wi, ei); __func__, dtlb, wi, ei);
} }
} else { } else {
tlb_flush_page(cs, entry->vaddr); tlb_flush_page(cs, entry->vaddr);
@ -806,15 +806,15 @@ static void set_dbreak(CPUXtensaState *env, unsigned i, uint32_t dbreaka,
} }
/* contiguous mask after inversion is one less than some power of 2 */ /* contiguous mask after inversion is one less than some power of 2 */
if ((~mask + 1) & ~mask) { if ((~mask + 1) & ~mask) {
qemu_log("DBREAKC mask is not contiguous: 0x%08x\n", dbreakc); qemu_log_mask(LOG_GUEST_ERROR, "DBREAKC mask is not contiguous: 0x%08x\n", dbreakc);
/* cut mask after the first zero bit */ /* cut mask after the first zero bit */
mask = 0xffffffff << (32 - clo32(mask)); mask = 0xffffffff << (32 - clo32(mask));
} }
if (cpu_watchpoint_insert(cs, dbreaka & mask, ~mask + 1, if (cpu_watchpoint_insert(cs, dbreaka & mask, ~mask + 1,
flags, &env->cpu_watchpoint[i])) { flags, &env->cpu_watchpoint[i])) {
env->cpu_watchpoint[i] = NULL; env->cpu_watchpoint[i] = NULL;
qemu_log("Failed to set data breakpoint at 0x%08x/%d\n", qemu_log_mask(LOG_GUEST_ERROR, "Failed to set data breakpoint at 0x%08x/%d\n",
dbreaka & mask, ~mask + 1); dbreaka & mask, ~mask + 1);
} }
} }

28
target-xtensa/translate.c
View file

@ -501,9 +501,9 @@ static bool gen_check_sr(DisasContext *dc, uint32_t sr, unsigned access)
{ {
if (!xtensa_option_bits_enabled(dc->config, sregnames[sr].opt_bits)) { if (!xtensa_option_bits_enabled(dc->config, sregnames[sr].opt_bits)) {
if (sregnames[sr].name) { if (sregnames[sr].name) {
qemu_log("SR %s is not configured\n", sregnames[sr].name); qemu_log_mask(LOG_GUEST_ERROR, "SR %s is not configured\n", sregnames[sr].name);
} else { } else {
qemu_log("SR %d is not implemented\n", sr); qemu_log_mask(LOG_UNIMP, "SR %d is not implemented\n", sr);
} }
gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE); gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE);
return false; return false;
@ -514,8 +514,8 @@ static bool gen_check_sr(DisasContext *dc, uint32_t sr, unsigned access)
[SR_X] = "xsr", [SR_X] = "xsr",
}; };
assert(access < ARRAY_SIZE(access_text) && access_text[access]); assert(access < ARRAY_SIZE(access_text) && access_text[access]);
qemu_log("SR %s is not available for %s\n", sregnames[sr].name, qemu_log_mask(LOG_GUEST_ERROR, "SR %s is not available for %s\n", sregnames[sr].name,
access_text[access]); access_text[access]);
gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE); gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE);
return false; return false;
} }
@ -875,18 +875,18 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc)
{ {
#define HAS_OPTION_BITS(opt) do { \ #define HAS_OPTION_BITS(opt) do { \
if (!option_bits_enabled(dc, opt)) { \ if (!option_bits_enabled(dc, opt)) { \
qemu_log("Option is not enabled %s:%d\n", \ qemu_log_mask(LOG_GUEST_ERROR, "Option is not enabled %s:%d\n", \
__FILE__, __LINE__); \ __FILE__, __LINE__); \
goto invalid_opcode; \ goto invalid_opcode; \
} \ } \
} while (0) } while (0)
#define HAS_OPTION(opt) HAS_OPTION_BITS(XTENSA_OPTION_BIT(opt)) #define HAS_OPTION(opt) HAS_OPTION_BITS(XTENSA_OPTION_BIT(opt))
#define TBD() qemu_log("TBD(pc = %08x): %s:%d\n", dc->pc, __FILE__, __LINE__) #define TBD() qemu_log_mask(LOG_UNIMP, "TBD(pc = %08x): %s:%d\n", dc->pc, __FILE__, __LINE__)
#define RESERVED() do { \ #define RESERVED() do { \
qemu_log("RESERVED(pc = %08x, %02x%02x%02x): %s:%d\n", \ qemu_log_mask(LOG_GUEST_ERROR, "RESERVED(pc = %08x, %02x%02x%02x): %s:%d\n", \
dc->pc, b0, b1, b2, __FILE__, __LINE__); \ dc->pc, b0, b1, b2, __FILE__, __LINE__); \
goto invalid_opcode; \ goto invalid_opcode; \
} while (0) } while (0)
@ -1186,7 +1186,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc)
gen_jump(dc, cpu_SR[EPC1 + RRR_S - 1]); gen_jump(dc, cpu_SR[EPC1 + RRR_S - 1]);
} }
} else { } else {
qemu_log("RFI %d is illegal\n", RRR_S); qemu_log_mask(LOG_GUEST_ERROR, "RFI %d is illegal\n", RRR_S);
gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE); gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE);
} }
break; break;
@ -1222,7 +1222,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc)
gen_helper_simcall(cpu_env); gen_helper_simcall(cpu_env);
} }
} else { } else {
qemu_log("SIMCALL but semihosting is disabled\n"); qemu_log_mask(LOG_GUEST_ERROR, "SIMCALL but semihosting is disabled\n");
gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE); gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE);
} }
break; break;
@ -1865,7 +1865,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc)
if (uregnames[st].name) { if (uregnames[st].name) {
tcg_gen_mov_i32(cpu_R[RRR_R], cpu_UR[st]); tcg_gen_mov_i32(cpu_R[RRR_R], cpu_UR[st]);
} else { } else {
qemu_log("RUR %d not implemented, ", st); qemu_log_mask(LOG_UNIMP, "RUR %d not implemented, ", st);
TBD(); TBD();
} }
} }
@ -1876,7 +1876,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc)
if (uregnames[RSR_SR].name) { if (uregnames[RSR_SR].name) {
gen_wur(RSR_SR, cpu_R[RRR_T]); gen_wur(RSR_SR, cpu_R[RRR_T]);
} else { } else {
qemu_log("WUR %d not implemented, ", RSR_SR); qemu_log_mask(LOG_UNIMP, "WUR %d not implemented, ", RSR_SR);
TBD(); TBD();
} }
} }
@ -3006,7 +3006,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc)
return; return;
invalid_opcode: invalid_opcode:
qemu_log("INVALID(pc = %08x)\n", dc->pc); qemu_log_mask(LOG_GUEST_ERROR, "INVALID(pc = %08x)\n", dc->pc);
gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE); gen_exception_cause(dc, ILLEGAL_INSTRUCTION_CAUSE);
#undef HAS_OPTION #undef HAS_OPTION
} }

2
target-xtensa/xtensa-semi.c
View file

@ -313,7 +313,7 @@ void HELPER(simcall)(CPUXtensaState *env)
break; break;
default: default:
qemu_log("%s(%d): not implemented\n", __func__, regs[2]); qemu_log_mask(LOG_GUEST_ERROR, "%s(%d): not implemented\n", __func__, regs[2]);
regs[2] = -1; regs[2] = -1;
regs[3] = TARGET_ENOSYS; regs[3] = TARGET_ENOSYS;
break; break;