From 9d3a16f7feba9fea4efd673be170bf6927c01b6e Mon Sep 17 00:00:00 2001 From: David Schleef Date: Fri, 13 Aug 2010 11:50:04 -0700 Subject: [PATCH] Fixes to handle opcodes with 3 sources --- orc/generate-emulation.c | 55 ++++++++++++++++++++++++++++---------------- orc/orcparse.c | 5 +++- orc/orcprogram.c | 6 +++++ testsuite/exec_opcodes_sys.c | 51 +++++++++++++++++++++++++++++----------- tools/orcc.c | 5 ++++ 5 files changed, 87 insertions(+), 35 deletions(-) diff --git a/orc/generate-emulation.c b/orc/generate-emulation.c index 7e33523..f375c04 100644 --- a/orc/generate-emulation.c +++ b/orc/generate-emulation.c @@ -125,44 +125,59 @@ main (int argc, char *argv[]) char s[40]; OrcProgram *program; OrcStaticOpcode *opcode = opcode_set->opcodes + i; + int args[4] = { -1, -1, -1, -1 }; + int n_args = 0; program = orc_program_new (); sprintf(s, "emulate_%s", opcode->name); orc_program_set_name (program, s); - if (opcode->flags & ORC_STATIC_OPCODE_ACCUMULATOR) { - orc_program_add_accumulator (program, opcode->dest_size[0], "d1"); - } else { - orc_program_add_destination (program, opcode->dest_size[0], "d1"); + if (opcode->dest_size[0] != 0) { + if (opcode->flags & ORC_STATIC_OPCODE_ACCUMULATOR) { + args[n_args++] = + orc_program_add_accumulator (program, opcode->dest_size[0], "d1"); + } else { + args[n_args++] = + orc_program_add_destination (program, opcode->dest_size[0], "d1"); + } } - if (opcode->dest_size[1]) { - orc_program_add_destination (program, opcode->dest_size[1], "d2"); + if (opcode->dest_size[1] != 0) { + args[n_args++] = + orc_program_add_destination (program, opcode->dest_size[1], "d2"); } - if (opcode->src_size[1]) { - orc_program_add_source (program, opcode->src_size[0], "s1"); - if (opcode->flags & ORC_STATIC_OPCODE_SCALAR) { - orc_program_add_parameter (program, opcode->src_size[1], "s2"); + if (opcode->src_size[0] != 0) { + if (opcode->src_size[1] == 0 && + opcode->flags & ORC_STATIC_OPCODE_SCALAR) { + args[n_args++] = + orc_program_add_parameter (program, opcode->src_size[0], "s1"); } else { - orc_program_add_source (program, opcode->src_size[1], "s2"); + args[n_args++] = + orc_program_add_source (program, opcode->src_size[0], "s1"); } - } else { + } + if (opcode->src_size[1] != 0) { if (opcode->flags & ORC_STATIC_OPCODE_SCALAR) { - orc_program_add_parameter (program, opcode->src_size[0], "s1"); + args[n_args++] = + orc_program_add_parameter (program, opcode->src_size[1], "s2"); } else { - orc_program_add_source (program, opcode->src_size[0], "s1"); + args[n_args++] = + orc_program_add_source (program, opcode->src_size[1], "s2"); } } - if (opcode->src_size[1]) { - orc_program_append_str (program, opcode->name, "d1", "s1", "s2"); - } else { - if (opcode->dest_size[1]) { - orc_program_append_dds_str (program, opcode->name, "d1", "d2", "s1"); + if (opcode->src_size[2] != 0) { + if (opcode->flags & ORC_STATIC_OPCODE_SCALAR) { + args[n_args++] = + orc_program_add_parameter (program, opcode->src_size[2], "s3"); } else { - orc_program_append_ds_str (program, opcode->name, "d1", "s1"); + args[n_args++] = + orc_program_add_source (program, opcode->src_size[2], "s3"); } } + orc_program_append_2 (program, opcode->name, 0, args[0], args[1], + args[2], args[3]); + output_code_emulate (program, output); } } diff --git a/orc/orcparse.c b/orc/orcparse.c index 2a5f891..2a09c82 100644 --- a/orc/orcparse.c +++ b/orc/orcparse.c @@ -219,7 +219,10 @@ orc_parse_full (const char *code, OrcProgram ***programs, char **log) token[offset], n_args); } - if (n_tokens - offset == 4) { + if (n_tokens - offset == 5) { + orc_program_append_str_2 (parser->program, token[offset], flags, + token[offset+1], token[offset+2], token[offset+3], token[offset+4]); + } else if (n_tokens - offset == 4) { char *end; int imm = strtol (token[offset + 3], &end, 0); if (end != token[offset + 3]) { diff --git a/orc/orcprogram.c b/orc/orcprogram.c index bfc0d3c..95bfab1 100644 --- a/orc/orcprogram.c +++ b/orc/orcprogram.c @@ -536,6 +536,9 @@ orc_program_append_2 (OrcProgram *program, const char *name, unsigned int flags, if (insn->opcode->src_size[1] != 0) { insn->src_args[1] = args[i++]; } + if (insn->opcode->src_size[2] != 0) { + insn->src_args[2] = args[i++]; + } program->n_insns++; } @@ -645,6 +648,9 @@ orc_program_append_str_2 (OrcProgram *program, const char *name, if (insn->opcode->src_size[1] != 0) { insn->src_args[1] = args[i++]; } + if (insn->opcode->src_size[2] != 0) { + insn->src_args[2] = args[i++]; + } program->n_insns++; } diff --git a/testsuite/exec_opcodes_sys.c b/testsuite/exec_opcodes_sys.c index 09c3cea..0a8dec7 100644 --- a/testsuite/exec_opcodes_sys.c +++ b/testsuite/exec_opcodes_sys.c @@ -147,32 +147,43 @@ test_opcode_const (OrcStaticOpcode *opcode) char s[40]; int ret; int flags = 0; + int args[4] = { -1, -1, -1, -1 }; + int n_args = 0; if (opcode->src_size[1] == 0) { return; } - p = orc_program_new (); if (opcode->flags & ORC_STATIC_OPCODE_ACCUMULATOR) { - orc_program_add_accumulator (p, opcode->dest_size[0], "d1"); + args[n_args++] = + orc_program_add_accumulator (p, opcode->dest_size[0], "d1"); } else { - orc_program_add_destination (p, opcode->dest_size[0], "d1"); + args[n_args++] = + orc_program_add_destination (p, opcode->dest_size[0], "d1"); } if (opcode->dest_size[1] != 0) { - orc_program_add_destination (p, opcode->dest_size[1], "d2"); + args[n_args++] = + orc_program_add_destination (p, opcode->dest_size[1], "d2"); + } + args[n_args++] = + orc_program_add_source (p, opcode->src_size[0], "s1"); + args[n_args++] = + orc_program_add_constant (p, opcode->src_size[1], 1, "c1"); + if (opcode->src_size[2]) { + args[n_args++] = + orc_program_add_constant (p, opcode->src_size[2], 1, "c2"); } - orc_program_add_source (p, opcode->src_size[0], "s1"); - orc_program_add_constant (p, opcode->src_size[1], 1, "c1"); if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { flags = ORC_TEST_FLAGS_FLOAT; } - sprintf(s, "test_c_%s", opcode->name); + sprintf(s, "test_const_%s", opcode->name); orc_program_set_name (p, s); - orc_program_append_str (p, opcode->name, "d1", "s1", "c1"); + orc_program_append_2 (p, opcode->name, 0, args[0], args[1], + args[2], args[3]); ret = orc_test_compare_output_full (p, flags); if (!ret) { @@ -190,21 +201,32 @@ test_opcode_param (OrcStaticOpcode *opcode) char s[40]; int ret; int flags = 0; + int args[4] = { -1, -1, -1, -1 }; + int n_args = 0; if (opcode->src_size[1] == 0) { return; } p = orc_program_new (); if (opcode->flags & ORC_STATIC_OPCODE_ACCUMULATOR) { - orc_program_add_accumulator (p, opcode->dest_size[0], "d1"); + args[n_args++] = + orc_program_add_accumulator (p, opcode->dest_size[0], "d1"); } else { - orc_program_add_destination (p, opcode->dest_size[0], "d1"); + args[n_args++] = + orc_program_add_destination (p, opcode->dest_size[0], "d1"); } if (opcode->dest_size[1] != 0) { - orc_program_add_destination (p, opcode->dest_size[1], "d2"); + args[n_args++] = + orc_program_add_destination (p, opcode->dest_size[1], "d2"); + } + args[n_args++] = + orc_program_add_source (p, opcode->src_size[0], "s1"); + args[n_args++] = + orc_program_add_parameter (p, opcode->src_size[1], "p1"); + if (opcode->src_size[2]) { + args[n_args++] = + orc_program_add_parameter (p, opcode->src_size[2], "p2"); } - orc_program_add_source (p, opcode->src_size[0], "s1"); - orc_program_add_parameter (p, opcode->src_size[1], "p1"); if ((opcode->flags & ORC_STATIC_OPCODE_FLOAT_SRC) || (opcode->flags & ORC_STATIC_OPCODE_FLOAT_DEST)) { @@ -214,7 +236,8 @@ test_opcode_param (OrcStaticOpcode *opcode) sprintf(s, "test_p_%s", opcode->name); orc_program_set_name (p, s); - orc_program_append_str (p, opcode->name, "d1", "s1", "p1"); + orc_program_append_2 (p, opcode->name, 0, args[0], args[1], + args[2], args[3]); ret = orc_test_compare_output_full (p, flags); if (!ret) { diff --git a/tools/orcc.c b/tools/orcc.c index bb42a36..231096f 100644 --- a/tools/orcc.c +++ b/tools/orcc.c @@ -838,6 +838,11 @@ output_program_generation (OrcProgram *p, FILE *output, int is_inline) } } else { if (p->vars[insn->src_args[1]].size != 0) { + fprintf(output, " orc_program_append_2 (p, \"%s\", %d, %s, %s, %s, %s);\n", + insn->opcode->name, insn->flags, enumnames[insn->dest_args[0]], + enumnames[insn->src_args[0]], enumnames[insn->src_args[1]], + enumnames[insn->src_args[2]]); + } else if (p->vars[insn->src_args[1]].size != 0) { fprintf(output, " orc_program_append_2 (p, \"%s\", %d, %s, %s, %s, -1);\n", insn->opcode->name, insn->flags, enumnames[insn->dest_args[0]], enumnames[insn->src_args[0]], enumnames[insn->src_args[1]]); -- 2.7.4