jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0,1}_SUFFIX
The generated *_user functions are unused. The *_kernel functions
have a couple of users in op_helper.c; use *_mmuidx_ra instead,
with MMU_KERNEL_IDX.
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
v2: Use *_mmuidx_ra directly, without intermediate macros.
+47
-32
-2
target/m68k/cpu.h
-2
target/m68k/cpu.h
+47
-30
target/m68k/op_helper.c
+47
-30
target/m68k/op_helper.c
···
42
42
uint32_t fmt;
43
43
44
44
sp = env->aregs[7];
45
-
fmt = cpu_ldl_kernel(env, sp);
46
-
env->pc = cpu_ldl_kernel(env, sp + 4);
45
+
fmt = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
46
+
env->pc = cpu_ldl_mmuidx_ra(env, sp + 4, MMU_KERNEL_IDX, 0);
47
47
sp |= (fmt >> 28) & 3;
48
48
env->aregs[7] = sp + 8;
49
49
···
58
58
59
59
sp = env->aregs[7];
60
60
throwaway:
61
-
sr = cpu_lduw_kernel(env, sp);
61
+
sr = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
62
62
sp += 2;
63
-
env->pc = cpu_ldl_kernel(env, sp);
63
+
env->pc = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
64
64
sp += 4;
65
65
if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
66
66
/* all except 68000 */
67
-
fmt = cpu_lduw_kernel(env, sp);
67
+
fmt = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
68
68
sp += 2;
69
69
switch (fmt >> 12) {
70
70
case 0:
···
260
260
/* ??? This could cause MMU faults. */
261
261
sp &= ~3;
262
262
sp -= 4;
263
-
cpu_stl_kernel(env, sp, retaddr);
263
+
cpu_stl_mmuidx_ra(env, sp, retaddr, MMU_KERNEL_IDX, 0);
264
264
sp -= 4;
265
-
cpu_stl_kernel(env, sp, fmt);
265
+
cpu_stl_mmuidx_ra(env, sp, fmt, MMU_KERNEL_IDX, 0);
266
266
env->aregs[7] = sp;
267
267
/* Jump to vector. */
268
-
env->pc = cpu_ldl_kernel(env, env->vbr + vector);
268
+
env->pc = cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, 0);
269
269
}
270
270
271
271
static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
···
278
278
switch (format) {
279
279
case 4:
280
280
*sp -= 4;
281
-
cpu_stl_kernel(env, *sp, env->pc);
281
+
cpu_stl_mmuidx_ra(env, *sp, env->pc, MMU_KERNEL_IDX, 0);
282
282
*sp -= 4;
283
-
cpu_stl_kernel(env, *sp, addr);
283
+
cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0);
284
284
break;
285
285
case 3:
286
286
case 2:
287
287
*sp -= 4;
288
-
cpu_stl_kernel(env, *sp, addr);
288
+
cpu_stl_mmuidx_ra(env, *sp, addr, MMU_KERNEL_IDX, 0);
289
289
break;
290
290
}
291
291
*sp -= 2;
292
-
cpu_stw_kernel(env, *sp, (format << 12) + (cs->exception_index << 2));
292
+
cpu_stw_mmuidx_ra(env, *sp, (format << 12) + (cs->exception_index << 2),
293
+
MMU_KERNEL_IDX, 0);
293
294
}
294
295
*sp -= 4;
295
-
cpu_stl_kernel(env, *sp, retaddr);
296
+
cpu_stl_mmuidx_ra(env, *sp, retaddr, MMU_KERNEL_IDX, 0);
296
297
*sp -= 2;
297
-
cpu_stw_kernel(env, *sp, sr);
298
+
cpu_stw_mmuidx_ra(env, *sp, sr, MMU_KERNEL_IDX, 0);
298
299
}
299
300
300
301
static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
···
353
354
cpu_abort(cs, "DOUBLE MMU FAULT\n");
354
355
}
355
356
env->mmu.fault = true;
357
+
/* push data 3 */
356
358
sp -= 4;
357
-
cpu_stl_kernel(env, sp, 0); /* push data 3 */
359
+
cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
360
+
/* push data 2 */
358
361
sp -= 4;
359
-
cpu_stl_kernel(env, sp, 0); /* push data 2 */
362
+
cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
363
+
/* push data 1 */
360
364
sp -= 4;
361
-
cpu_stl_kernel(env, sp, 0); /* push data 1 */
365
+
cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
366
+
/* write back 1 / push data 0 */
362
367
sp -= 4;
363
-
cpu_stl_kernel(env, sp, 0); /* write back 1 / push data 0 */
368
+
cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
369
+
/* write back 1 address */
364
370
sp -= 4;
365
-
cpu_stl_kernel(env, sp, 0); /* write back 1 address */
371
+
cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
372
+
/* write back 2 data */
366
373
sp -= 4;
367
-
cpu_stl_kernel(env, sp, 0); /* write back 2 data */
374
+
cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
375
+
/* write back 2 address */
368
376
sp -= 4;
369
-
cpu_stl_kernel(env, sp, 0); /* write back 2 address */
377
+
cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
378
+
/* write back 3 data */
370
379
sp -= 4;
371
-
cpu_stl_kernel(env, sp, 0); /* write back 3 data */
380
+
cpu_stl_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
381
+
/* write back 3 address */
372
382
sp -= 4;
373
-
cpu_stl_kernel(env, sp, env->mmu.ar); /* write back 3 address */
383
+
cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0);
384
+
/* fault address */
374
385
sp -= 4;
375
-
cpu_stl_kernel(env, sp, env->mmu.ar); /* fault address */
386
+
cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0);
387
+
/* write back 1 status */
376
388
sp -= 2;
377
-
cpu_stw_kernel(env, sp, 0); /* write back 1 status */
389
+
cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
390
+
/* write back 2 status */
378
391
sp -= 2;
379
-
cpu_stw_kernel(env, sp, 0); /* write back 2 status */
392
+
cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
393
+
/* write back 3 status */
380
394
sp -= 2;
381
-
cpu_stw_kernel(env, sp, 0); /* write back 3 status */
395
+
cpu_stw_mmuidx_ra(env, sp, 0, MMU_KERNEL_IDX, 0);
396
+
/* special status word */
382
397
sp -= 2;
383
-
cpu_stw_kernel(env, sp, env->mmu.ssw); /* special status word */
398
+
cpu_stw_mmuidx_ra(env, sp, env->mmu.ssw, MMU_KERNEL_IDX, 0);
399
+
/* effective address */
384
400
sp -= 4;
385
-
cpu_stl_kernel(env, sp, env->mmu.ar); /* effective address */
401
+
cpu_stl_mmuidx_ra(env, sp, env->mmu.ar, MMU_KERNEL_IDX, 0);
402
+
386
403
do_stack_frame(env, &sp, 7, oldsr, 0, retaddr);
387
404
env->mmu.fault = false;
388
405
if (qemu_loglevel_mask(CPU_LOG_INT)) {
···
414
431
415
432
env->aregs[7] = sp;
416
433
/* Jump to vector. */
417
-
env->pc = cpu_ldl_kernel(env, env->vbr + vector);
434
+
env->pc = cpu_ldl_mmuidx_ra(env, env->vbr + vector, MMU_KERNEL_IDX, 0);
418
435
}
419
436
420
437
static void do_interrupt_all(CPUM68KState *env, int is_hw)