OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target: e2k: Add e2k_todo{,_illop} macros.

This commit is contained in:
Denis Drakhnia 2020-12-13 23:45:02 +02:00 committed by Denis Drakhnia
parent 4646e43803
commit 1dd030c321
4 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/e2k/helper.c
View File

@ -286,7 +286,6 @@ bool e2k_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
cs->exception_index = E2K_EXCP_MAPERR; cs->exception_index = E2K_EXCP_MAPERR;
cpu_loop_exit_restore(cs, retaddr); cpu_loop_exit_restore(cs, retaddr);
return false;
} }
void helper_debug_i32(uint32_t x) void helper_debug_i32(uint32_t x)

16
target/e2k/translate.h
View File

@ -212,6 +212,22 @@ static inline void e2k_gen_exception(int excp)
tcg_temp_free_i32(t0); tcg_temp_free_i32(t0);
} }
#define e2k_todo(ctx, fmt, ...) \
do { \
if (unlikely(qemu_loglevel_mask(LOG_UNIMP))) { \
qemu_log("%#lx: todo: ", ctx->pc); \
qemu_log(fmt, ## __VA_ARGS__); \
qemu_log("\n"); \
} \
} while (0)
#define e2k_todo_illop(ctx, fmt, ...) \
do { \
e2k_todo(ctx, fmt, ## __VA_ARGS__); \
e2k_tr_gen_exception(ctx, E2K_EXCP_ILLOPC); \
} while (0)
static inline void e2k_gen_mask_i64(TCGv_i64 ret, TCGv_i64 len) static inline void e2k_gen_mask_i64(TCGv_i64 ret, TCGv_i64 len)
{ {
TCGv_i64 one = tcg_const_i64(1); TCGv_i64 one = tcg_const_i64(1);

8
target/e2k/translate/alc.c
View File

@ -1342,9 +1342,7 @@ static MemOp gen_mas(DisasContext *ctx, int chan, MemOp memop, TCGv_i64 addr)
if ((mas & 0x7) == 7) { if ((mas & 0x7) == 7) {
int opc = mas >> 3; int opc = mas >> 3;
// TODO: special mas // TODO: special mas
// e2k_tr_gen_exception(ctx, E2K_EXCP_ILLOPC); e2k_todo(ctx, "mas=%#x, opc=%#x", mas, opc);
qemu_log_mask(LOG_UNIMP, "0x%lx: mas=%#x, opc=%#x is not implemented!\n",
ctx->pc, mas, opc);
return 0; return 0;
} else if (mas) { } else if (mas) {
int mod = extract8(mas, 0, 3); int mod = extract8(mas, 0, 3);
@ -1352,9 +1350,7 @@ static MemOp gen_mas(DisasContext *ctx, int chan, MemOp memop, TCGv_i64 addr)
if (mod != 0) { if (mod != 0) {
// TODO: mas modes // TODO: mas modes
// e2k_tr_gen_exception(ctx, E2K_EXCP_ILLOPC); e2k_todo(ctx, "mas=%#x, mod=%#x", mas, mod);
qemu_log_mask(LOG_UNIMP, "0x%lx: mas=%#x, mod=%#x is not implemented!\n",
ctx->pc, mas, mod);
} }
memop |= GET_BIT(mas, 3) ? MO_BE : MO_LE; memop |= GET_BIT(mas, 3) ? MO_BE : MO_LE;

58
target/e2k/translate/control.c
View File

@ -161,20 +161,9 @@ void e2k_stubs_commit(DisasContext *ctx)
gen_cur_dec(ctx, e2k_cs.bcur, abn, e2k_cs.bcur, 2, e2k_cs.bsize); gen_cur_dec(ctx, e2k_cs.bcur, abn, e2k_cs.bcur, 2, e2k_cs.bsize);
} }
switch(abg) { if (abg != 0) {
case 0x00: // TODO: impl abg
break; e2k_todo_illop(ctx, "abg");
case 0x01:
// TODO: abgd
abort();
break;
case 0x02:
// TODO: abgi
abort();
break;
default:
e2k_tr_gen_exception(ctx, E2K_EXCP_ILLOPC);
break;
} }
} }
@ -291,7 +280,7 @@ static void gen_cs0(DisasContext *dc)
"invalid gettsd" if this turns out not to be the case . . . */ "invalid gettsd" if this turns out not to be the case . . . */
if (type == GETTSD) { if (type == GETTSD) {
// TODO: gettsd // TODO: gettsd
abort(); e2k_todo_illop(dc, "gettsd");
} }
if (type == PUTTSD) { if (type == PUTTSD) {
@ -308,7 +297,7 @@ static void gen_cs0(DisasContext *dc)
both on 32 and 64-bit hosts. */ both on 32 and 64-bit hosts. */
// (unsigned long long) (instr_addr + sgnd_disp)); // (unsigned long long) (instr_addr + sgnd_disp));
// TODO: puttsd // TODO: puttsd
abort(); e2k_todo_illop(dc, "puttsd");
} }
if (type == PREF) { if (type == PREF) {
@ -316,7 +305,7 @@ static void gen_cs0(DisasContext *dc)
// unsigned int ipd = (bundle->cs0 & 0x00000008) >> 3; // unsigned int ipd = (bundle->cs0 & 0x00000008) >> 3;
// unsigned int prefr = bundle->cs0 & 0x00000007; // unsigned int prefr = bundle->cs0 & 0x00000007;
// TODO: pref // TODO: pref
abort(); e2k_todo_illop(dc, "pref");
} }
} }
} }
@ -345,17 +334,16 @@ static void gen_cs1(DisasContext *dc)
if (sft) { if (sft) {
if (dc->version >= 2) { if (dc->version >= 2) {
// TODO: setsft // TODO: setsft
abort(); e2k_todo_illop(dc, "setsft");
} else { } else {
e2k_tr_gen_exception(dc, E2K_EXCP_ILLOPC); e2k_tr_gen_exception(dc, E2K_EXCP_ILLOPC);
} }
} else { } else {
// uint8_t eir = GET_FIELD_LEN(cs1, 0, 8); // uint8_t eir = GET_FIELD_LEN(cs1, 0, 8);
// TODO: setei // TODO: setei
abort(); e2k_todo_illop(dc, "setei");
} }
} else if (opc == WAIT) { } else if (opc == WAIT) {
// TODO: wait
// unsigned int ma_c = (cs1 & 0x00000020) >> 5; // unsigned int ma_c = (cs1 & 0x00000020) >> 5;
// unsigned int fl_c = (cs1 & 0x00000010) >> 4; // unsigned int fl_c = (cs1 & 0x00000010) >> 4;
unsigned int ld_c = (cs1 & 0x00000008) >> 3; unsigned int ld_c = (cs1 & 0x00000008) >> 3;
@ -382,8 +370,8 @@ static void gen_cs1(DisasContext *dc)
// unsigned int trap = (cs1 & 0x00000040) >> 6; // unsigned int trap = (cs1 & 0x00000040) >> 6;
// my_printf ("trap = %d, ", trap); // my_printf ("trap = %d, ", trap);
} }
// TODO: wait
qemu_log_mask(LOG_UNIMP, "0x%lx: wait is not implemented!\n", dc->pc); e2k_todo(dc, "wait");
// my_printf ("ma_c = %d, fl_c = %d, ld_c = %d, st_c = %d, all_e = %d, " // my_printf ("ma_c = %d, fl_c = %d, ld_c = %d, st_c = %d, all_e = %d, "
// "all_c = %d", ma_c, fl_c, ld_c, st_c, all_e, all_c); // "all_c = %d", ma_c, fl_c, ld_c, st_c, all_e, all_c);
} else if (opc == CALL) { } else if (opc == CALL) {
@ -402,7 +390,7 @@ static void gen_cs1(DisasContext *dc)
if (cs0_opc == 0) { if (cs0_opc == 0) {
// unsigned int hdisp = (cs0 & 0x1e) >> 1; // unsigned int hdisp = (cs0 & 0x1e) >> 1;
// TODO: hcall hdisp, wbs ? cond // TODO: hcall hdisp, wbs ? cond
abort(); e2k_todo_illop(dc, "hcall");
} }
} else { } else {
e2k_tr_gen_exception(dc, E2K_EXCP_ILLOPC); e2k_tr_gen_exception(dc, E2K_EXCP_ILLOPC);
@ -416,12 +404,12 @@ static void gen_cs1(DisasContext *dc)
} else if (opc == FLUSHR) { } else if (opc == FLUSHR) {
if (cs1 & 0x00000001) { if (cs1 & 0x00000001) {
// TODO: flushr // TODO: flushr
abort(); e2k_todo_illop(dc, "flushr");
} }
if (cs1 & 0x00000002) { if (cs1 & 0x00000002) {
// TODO: flushc // TODO: flushc
abort(); e2k_todo_illop(dc, "flushc");
} }
} else if (opc == BG) { } else if (opc == BG) {
// unsigned int chkm4 = (cs1 & 0x00010000) >> 16; // unsigned int chkm4 = (cs1 & 0x00010000) >> 16;
@ -429,7 +417,7 @@ static void gen_cs1(DisasContext *dc)
// unsigned int umsk = cs1 & 0x000000ff; // unsigned int umsk = cs1 & 0x000000ff;
// TODO: vfbg // TODO: vfbg
abort(); e2k_todo_illop(dc, "vfbg");
} }
} }
@ -528,7 +516,7 @@ static void gen_jmp(DisasContext *ctx)
} }
default: default:
// TODO // TODO
qemu_log_mask(LOG_UNIMP, "%#lx: ct cond %#x is not implemented!\n", ctx->pc, cond_type); e2k_todo(ctx, "branch condition %#x", cond_type);
tcg_gen_movi_i32(e2k_cs.ct_cond, 0); tcg_gen_movi_i32(e2k_cs.ct_cond, 0);
break; break;
} }
@ -544,7 +532,7 @@ static void gen_jmp(DisasContext *ctx)
// static const int conv[] = {0, 1, 3, 4}; // static const int conv[] = {0, 1, 3, 4};
int i; int i;
qemu_log_mask(LOG_UNIMP, "0x%lx: %%MLOCK || %%dt_alM is not implemented!\n", ctx->pc); e2k_todo(ctx, "%%MLOCK || %%dt_alM");
// %dt_al // %dt_al
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (psrc & (1 << i)) { if (psrc & (1 << i)) {
@ -552,7 +540,7 @@ static void gen_jmp(DisasContext *ctx)
} }
} }
} else { } else {
qemu_log_mask(LOG_UNIMP, "0x%lx: %%MLOCK is not implemented!\n", ctx->pc); e2k_todo(ctx, "%%MLOCK");
} }
} }
@ -566,7 +554,7 @@ static void gen_jmp(DisasContext *ctx)
// my_printf ("%%MLOCK || %s%%cmp%d", neg ? "~" : "", // my_printf ("%%MLOCK || %s%%cmp%d", neg ? "~" : "",
// cmp_num_to_alc[cmp_num]); // cmp_num_to_alc[cmp_num]);
qemu_log_mask(LOG_UNIMP, "0x%lx: %%MLOCK || %%cmpN is not implemented!\n", ctx->pc); e2k_todo(ctx, "%%MLOCK || %%cmpN");
} else if (type == 1) { } else if (type == 1) {
// unsigned int cmp_jk = (psrc & 0x4) >> 2; // unsigned int cmp_jk = (psrc & 0x4) >> 2;
// unsigned int negj = (psrc & 0x2) >> 1; // unsigned int negj = (psrc & 0x2) >> 1;
@ -575,20 +563,19 @@ static void gen_jmp(DisasContext *ctx)
// my_printf ("%%MLOCK || %s%%cmp%d || %s%%cmp%d", // my_printf ("%%MLOCK || %s%%cmp%d || %s%%cmp%d",
// negj ? "~" : "", cmp_jk == 0 ? 0 : 3, // negj ? "~" : "", cmp_jk == 0 ? 0 : 3,
// negk ? "~" : "", cmp_jk == 0 ? 1 : 4); // negk ? "~" : "", cmp_jk == 0 ? 1 : 4);
qemu_log_mask(LOG_UNIMP, "0x%lx: %%MLOCK || %%cmpN || %%cmpM is not implemented!\n", ctx->pc); e2k_todo(ctx, "%%MLOCK || %%cmpN || %%cmpM");
} else if (type == 2) { } else if (type == 2) {
// unsigned int clp_num = (psrc & 0x6) >> 1; // unsigned int clp_num = (psrc & 0x6) >> 1;
// unsigned int neg = psrc & 0x1; // unsigned int neg = psrc & 0x1;
// "%%MLOCK || %s%%clp%d", neg ? "~" : "", clp_num // "%%MLOCK || %s%%clp%d", neg ? "~" : "", clp_num
qemu_log_mask(LOG_UNIMP, "0x%lx: %%MLOCK || %%clpN is not implemented!\n", ctx->pc); e2k_todo(ctx, "%%MLOCK || %%clpN");
} }
} }
if (cond_type >= 0xa && cond_type <= 0xd) { if (cond_type >= 0xa && cond_type <= 0xd) {
// reserved condition type // reserved condition type
qemu_log_mask(LOG_UNIMP, "Undefined control transfer type %#x\n", cond_type); e2k_todo_illop(ctx, "undefined control transfer type %#x", cond_type);
abort();
} }
} }
} }
@ -627,8 +614,7 @@ void e2k_control_window_change(DisasContext *dc)
seems to be the case even if no SETWD has been explicitly seems to be the case even if no SETWD has been explicitly
specified. */ specified. */
// unsigned int rpsz = (bundle->lts[0] & 0x0001f000) >> 12; // unsigned int rpsz = (bundle->lts[0] & 0x0001f000) >> 12;
qemu_log_mask(LOG_UNIMP, "0x%lx: vfrpsz is not implemented!", e2k_todo(dc, "vfrpsz");
dc->pc);
} }
} }