diff options
| author | edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-06-30 08:59:49 +0000 |
|---|---|---|
| committer | edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-06-30 08:59:49 +0000 |
| commit | d297f464d386f85eda77263d81c598c7aaff46d9 (patch) | |
| tree | c37dea3e30f126183eb6a07440a7989fdb32b111 /target-cris | |
| parent | a50f5b9186c1bf76899365ab61b11d8ef487f4a8 (diff) | |
| download | hqemu-d297f464d386f85eda77263d81c598c7aaff46d9.zip hqemu-d297f464d386f85eda77263d81c598c7aaff46d9.tar.gz | |
Avoid CRIS related warnings by Jan Kiszka.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4804 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-cris')
| -rw-r--r-- | target-cris/mmu.c | 6 | ||||
| -rw-r--r-- | target-cris/translate.c | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/target-cris/mmu.c b/target-cris/mmu.c index 86f625b..122e652 100644 --- a/target-cris/mmu.c +++ b/target-cris/mmu.c @@ -30,7 +30,11 @@ #include "mmu.h" #include "exec-all.h" +#ifdef DEBUG +#define D(x) x +#else #define D(x) +#endif void cris_mmu_init(CPUState *env) { @@ -95,6 +99,7 @@ static inline void set_field(uint32_t *dst, unsigned int val, *dst |= val; } +#ifdef DEBUG static void dump_tlb(CPUState *env, int mmu) { int set; @@ -113,6 +118,7 @@ static void dump_tlb(CPUState *env, int mmu) } } } +#endif /* rw 0 = read, 1 = write, 2 = exec. */ static int cris_mmu_translate_page(struct cris_mmu_result_t *res, diff --git a/target-cris/translate.c b/target-cris/translate.c index c3b8ade..2fc4101 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3075,14 +3075,15 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb, if (loglevel & CPU_LOG_TB_IN_ASM) { fprintf(logfile, - "srch=%d pc=%x %x flg=%llx bt=%x ds=%lld ccs=%x\n" + "srch=%d pc=%x %x flg=%llx bt=%x ds=%u ccs=%x\n" "pid=%x usp=%x\n" "%x.%x.%x.%x\n" "%x.%x.%x.%x\n" "%x.%x.%x.%x\n" "%x.%x.%x.%x\n", - search_pc, dc->pc, dc->ppc, tb->flags, - env->btarget, tb->flags & 7, + search_pc, dc->pc, dc->ppc, + (unsigned long long)tb->flags, + env->btarget, (unsigned)tb->flags & 7, env->pregs[PR_CCS], env->pregs[PR_PID], env->pregs[PR_USP], env->regs[0], env->regs[1], env->regs[2], env->regs[3], @@ -3228,7 +3229,7 @@ gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb, fprintf(logfile, "--------------\n"); fprintf(logfile, "IN: %s\n", lookup_symbol(pc_start)); target_disas(logfile, pc_start, dc->pc - pc_start, 0); - fprintf(logfile, "\nisize=%d osize=%d\n", + fprintf(logfile, "\nisize=%d osize=%zd\n", dc->pc - pc_start, gen_opc_ptr - gen_opc_buf); } #endif |
