OpenRISC orfpx64a32 support
v2 cover OpenRISC orfpx64a32 support
Hello,
This is basically a resend, but properly including binutils list.
Changes from v1:
- Rebased
- Note Andrey is working on doing his FSF copyright assignment for binutils, sim
This is a set of patches to the OpenRISC assembler and simulator to support 64-bit floating point operations on 32-bit cores using register pairs, see orfpx64a32 [0].
The original patches were written by Andrey Bacherov and I have made some updates to get the simulator working and to match ABI updates from GCC 9. The main GCC 9 ABI change is to have r16 and above pair with an n+2 register rather than n+1. This is done because openrisc callee saved registers are r14-r30 (even). If a 64-bit value was stored in {r16,r17}, it would always need to be spilled across function calls as r17 is volatile. Therefore, values of 64-bits and greater are stored in even reg pairs, such as {r16,r18}.
Example of orfpx64a32 operations:
lf.add.d r4, r6, r8 ; {r3,r4} <= {r5,r6} + {r7,r8}
lf.add.d r16, r20, r24 ; {r16,r18} <= {r20,r22} + {r24,r26}These binutil patches have been used along with the GCC FPU patches [1] on the OpenRISC GCC 9 toolchain to test single and double precision floating point support. The main 'real' implementation of this hardware is Andrey's or1k_marocchino [2] core implementation which we have been using along with simulators for verification.
This whole patch series can be found on my github repo [3] as well.
[0] https://openrisc.io/proposals/orfpx64a32
[1] git at github.com:stffrdhrn/gcc.git or1k-fpu-1
[2] https://github.com/openrisc/or1k_marocchino
[3] [email protected]:stffrdhrn/binutils-gdb.git orfpx64a32-2
Stafford Horne (6):
cpu: Add support for orfp64a32 spec
opcodes: Regenerate opcodes for orfp64a32 spec sim/or1k: Regenerate sim for orfp64a32 spec sim/common: Wire in df/di conversion
sim/or1k: Add test for 64-bit fpu operations sim/common: Fix issue with wrong byte order on BE targets
cpu/or1k.cpu | 15 +- cpu/or1kcommon.cpu | 103 ++++-- cpu/or1korfpx.cpu | 113 +++++-- opcodes/or1k-asm.c | 19 +- opcodes/or1k-desc.c | 227 +++++++++++-- opcodes/or1k-desc.h | 330 +++++++++---------- opcodes/or1k-dis.c | 19 +- opcodes/or1k-ibld.c | 114 ++++++- opcodes/or1k-opc.c | 166 ++++++++-- opcodes/or1k-opc.h | 21 +- opcodes/or1k-opinst.c | 51 +++ sim/common/cgen-accfp.c | 24 ++ sim/common/cgen-ops.h | 8 +- sim/or1k/cpu.c | 60 +++- sim/or1k/cpu.h | 115 ++++++- sim/or1k/decode.c | 302 ++++++++++++++---- sim/or1k/decode.h | 16 +- sim/or1k/model.c | 510 ++++++++++++++++++++++++++++++ sim/or1k/sem-switch.c | 296 +++++++++++++++++ sim/or1k/sem.c | 326 +++++++++++++++++++ sim/testsuite/sim/or1k/fpu64a32.S | 172 ++++++++++ 21 files changed, 2637 insertions(+), 370 deletions(-) create mode 100644 sim/testsuite/sim/or1k/fpu64a32.S
Signature · 1 line
2.19.1
PATCH v2 1/6 cpu: Add support for orfp64a32 spec
This patch adds support for OpenRISC 64-bit FPU operations on 32-bit cores by using register pairs. The functionality is being added to the OpenRISC spec as per architecture proposal 14[0].
This patch also contains a few fixes to the symantics for existing OpenRISC single and double precision FPU operations.
[0] https://openrisc.io/proposals/orfpx64a32
cpu/ChangeLog:
yyyy-mm-dd Andrey Bacherov <[email protected]>
Stafford Horne <[email protected]>
* or1k.cpu (ORFPX64A32-MACHS): New pmacro.
(ORFPX-MACHS): Removed pmacro.
* or1kcommon.cpu (h-spr, spr-shift, spr-address, h-gpr): Reorder and add comments.
(h-fdr): Update comment to indicate or64. (reg-pair-offset): New hardware for 64-bit or32 register pair. (h-fd32r): New hardware for 64-bit fpu registers. (h-i64r): New hardware for 64-bit int registers.
* or1korfpx.cpu (rDSF, rASF, rBSF): Update attribute to ORFPX32-MACHS. (rDDF, rADF, rBDF): Update operand comment to indicate or64. (rDD32F, rAD32F, rBD32F, rDDI, rADI): New operands. (float-regreg-insn): Update single precision generator to MACH ORFPX32-MACHS. Add generator for or32 64-bit instructions. (float-setflag-insn): Update single precision generator to MACH ORFPX32-MACHS. Fix double instructions from single to double precision. Add generator for or32 64-bit instructions. (float-cust-insn cust-num): Update single precision generator to MACH ORFPX32-MACHS. Add generator for or32 64-bit instructions. (lf-rem-s, lf-itof-s, lf-ftoi-s, lf-madd-s): Update MACH to ORFPX32-MACHS.
(lf-rem-d): Fix operation from mod to rem.
(lf-rem-d32, lf-itof-d32, lf-ftoi-d32, lf-madd-d32): New instruction. (lf-itof-d): Fix operands from single to double. (lf-ftoi-d): Update operand mode from DI to WI.
--- cpu/or1k.cpu | 15 +++--- cpu/or1kcommon.cpu | 103 +++++++++++++++++++++++++++++++++-------- cpu/or1korfpx.cpu | 113 +++++++++++++++++++++++++++++++++++++-------- 3 files changed, 186 insertions(+), 45 deletions(-)
cpu/or1k.cpu +8 -7
@@ -1,8 +1,9 @@ ; OpenRISC 1000 architecture. -*- Scheme -*- -; Copyright 2000-2014 Free Software Foundation, Inc. +; Copyright 2000-2019 Free Software Foundation, Inc. ; Contributed for OR32 by Johan Rydberg, jrydberg at opencores.org ; Modified by Julius Baxter, juliusbaxter at gmail.com ; Modified by Peter Gavin, pgavin at gmail.com +; Modified by Andrey Bacherov, avbacherov at opencores.org ; ; This program is free software; you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by
@@ -42,12 +43,12 @@ (base-insn-bitsize 32) ) -(define-pmacro OR32-MACHS or32,or32nd) -(define-pmacro OR64-MACHS or64,or64nd) -(define-pmacro ORBIS-MACHS or32,or32nd,or64,or64nd) -(define-pmacro ORFPX-MACHS or32,or32nd,or64,or64nd) -(define-pmacro ORFPX32-MACHS or32,or32nd,or64,or64nd) -(define-pmacro ORFPX64-MACHS or64,or64nd) +(define-pmacro OR32-MACHS or32,or32nd) +(define-pmacro OR64-MACHS or64,or64nd) +(define-pmacro ORBIS-MACHS or32,or32nd,or64,or64nd) +(define-pmacro ORFPX32-MACHS or32,or32nd,or64,or64nd) +(define-pmacro ORFPX64-MACHS or64,or64nd) +(define-pmacro ORFPX64A32-MACHS or32,or32nd) ; float64 for 32-bit machs (define-attr (for model)
cpu/or1kcommon.cpu +85 -18
133 lines not on this page · raw message
cpu/or1korfpx.cpu +93 -20
220 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v2 2/6 opcodes: Regenerate opcodes for orfp64a32 spec
In reply to Stafford Horneopcodes/ChangeLog:
* or1k-asm.c: Regenerated.
* or1k-desc.c: Regenerated.
* or1k-desc.h: Regenerated.
* or1k-dis.c: Regenerated.
* or1k-ibld.c: Regenerated.
* or1k-opc.c: Regenerated.
* or1k-opc.h: Regenerated.
* or1k-opinst.c: Regenerated.
--- opcodes/or1k-asm.c | 19 ++- opcodes/or1k-desc.c | 227 ++++++++++++++++++++++++++--- opcodes/or1k-desc.h | 330 +++++++++++++++++++++--------------------- opcodes/or1k-dis.c | 19 ++- opcodes/or1k-ibld.c | 114 +++++++++++++-- opcodes/or1k-opc.c | 166 ++++++++++++++++++--- opcodes/or1k-opc.h | 21 +-- opcodes/or1k-opinst.c | 51 +++++++ 8 files changed, 716 insertions(+), 231 deletions(-)
opcodes/or1k-asm.c +17 -2
@@ -466,8 +466,14 @@ or1k_cgen_parse_operand (CGEN_CPU_DESC cd,case OR1K_OPERAND_RA : errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_gpr, & fields->f_r2);break ; +case OR1K_OPERAND_RAD32F : + errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fd32r, & fields->f_r2); +break ;case OR1K_OPERAND_RADF : - errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fdr, & fields->f_r1); + errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fdr, & fields->f_r2); +break ; +case OR1K_OPERAND_RADI : + errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_i64r, & fields->f_r2);break ;case OR1K_OPERAND_RASF : errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fsr, & fields->f_r2);
@@ -475,8 +481,11 @@ or1k_cgen_parse_operand (CGEN_CPU_DESC cd,case OR1K_OPERAND_RB : errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_gpr, & fields->f_r3);break ; +case OR1K_OPERAND_RBD32F : + errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fd32r, & fields->f_r3); +break ;case OR1K_OPERAND_RBDF : - errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fdr, & fields->f_r1); + errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fdr, & fields->f_r3);break ;case OR1K_OPERAND_RBSF : errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fsr, & fields->f_r3);
@@ -484,9 +493,15 @@ or1k_cgen_parse_operand (CGEN_CPU_DESC cd,case OR1K_OPERAND_RD : errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_gpr, & fields->f_r1);break ; +case OR1K_OPERAND_RDD32F : + errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fd32r, & fields->f_r1); +break ;case OR1K_OPERAND_RDDF : errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fdr, & fields->f_r1);break ; +case OR1K_OPERAND_RDDI : + errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_i64r, & fields->f_r1); +break ;case OR1K_OPERAND_RDSF : errmsg =cgen_parse_keyword (cd, strp, & or1k_cgen_opval_h_fsr, & fields->f_r1);break ;
opcodes/or1k-desc.c +208 -19
376 lines not on this page · raw message
opcodes/or1k-desc.h +167 -163
353 lines not on this page · raw message
opcodes/or1k-dis.c +17 -2
@@ -99,8 +99,14 @@ or1k_cgen_print_operand (CGEN_CPU_DESC cd,case OR1K_OPERAND_RA :print_keyword (cd, info, & or1k_cgen_opval_h_gpr, fields->f_r2,0 );break ; +case OR1K_OPERAND_RAD32F : +print_keyword (cd, info, & or1k_cgen_opval_h_fd32r, fields->f_r2,0 ); +break ;case OR1K_OPERAND_RADF : -print_keyword (cd, info, & or1k_cgen_opval_h_fdr, fields->f_r1,0 ); +print_keyword (cd, info, & or1k_cgen_opval_h_fdr, fields->f_r2,0 ); +break ; +case OR1K_OPERAND_RADI : +print_keyword (cd, info, & or1k_cgen_opval_h_i64r, fields->f_r2,0 );break ;case OR1K_OPERAND_RASF :print_keyword (cd, info, & or1k_cgen_opval_h_fsr, fields->f_r2,0 );
@@ -108,8 +114,11 @@ or1k_cgen_print_operand (CGEN_CPU_DESC cd,case OR1K_OPERAND_RB :print_keyword (cd, info, & or1k_cgen_opval_h_gpr, fields->f_r3,0 );break ; +case OR1K_OPERAND_RBD32F : +print_keyword (cd, info, & or1k_cgen_opval_h_fd32r, fields->f_r3,0 ); +break ;case OR1K_OPERAND_RBDF : -print_keyword (cd, info, & or1k_cgen_opval_h_fdr, fields->f_r1,0 ); +print_keyword (cd, info, & or1k_cgen_opval_h_fdr, fields->f_r3,0 );break ;case OR1K_OPERAND_RBSF :print_keyword (cd, info, & or1k_cgen_opval_h_fsr, fields->f_r3,0 );
@@ -117,9 +126,15 @@ or1k_cgen_print_operand (CGEN_CPU_DESC cd,case OR1K_OPERAND_RD :print_keyword (cd, info, & or1k_cgen_opval_h_gpr, fields->f_r1,0 );break ; +case OR1K_OPERAND_RDD32F : +print_keyword (cd, info, & or1k_cgen_opval_h_fd32r, fields->f_r1,0 ); +break ;case OR1K_OPERAND_RDDF :print_keyword (cd, info, & or1k_cgen_opval_h_fdr, fields->f_r1,0 );break ; +case OR1K_OPERAND_RDDI : +print_keyword (cd, info, & or1k_cgen_opval_h_i64r, fields->f_r1,0 ); +break ;case OR1K_OPERAND_RDSF :print_keyword (cd, info, & or1k_cgen_opval_h_fsr, fields->f_r1,0 );break ;
opcodes/or1k-ibld.c +102 -12
252 lines not on this page · raw message
opcodes/or1k-opc.c +142 -24
298 lines not on this page · raw message
opcodes/or1k-opc.h +12 -9
@@ -65,21 +65,24 @@ typedef enum cgen_insn_type { , OR1K_INSN_L_MACU, OR1K_INSN_L_MSB, OR1K_INSN_L_MSBU, OR1K_INSN_L_CUST1 ,OR1K_INSN_L_CUST2 ,OR1K_INSN_L_CUST3 ,OR1K_INSN_L_CUST4 ,OR1K_INSN_L_CUST5 ,OR1K_INSN_L_CUST6 ,OR1K_INSN_L_CUST7 ,OR1K_INSN_L_CUST8 ,OR1K_INSN_LF_ADD_S - ,OR1K_INSN_LF_ADD_D ,OR1K_INSN_LF_SUB_S ,OR1K_INSN_LF_SUB_D ,OR1K_INSN_LF_MUL_S - ,OR1K_INSN_LF_MUL_D ,OR1K_INSN_LF_DIV_S ,OR1K_INSN_LF_DIV_D ,OR1K_INSN_LF_REM_S - ,OR1K_INSN_LF_REM_D ,OR1K_INSN_LF_ITOF_S ,OR1K_INSN_LF_ITOF_D ,OR1K_INSN_LF_FTOI_S - ,OR1K_INSN_LF_FTOI_D ,OR1K_INSN_LF_EQ_S ,OR1K_INSN_LF_EQ_D ,OR1K_INSN_LF_NE_S - ,OR1K_INSN_LF_NE_D ,OR1K_INSN_LF_GE_S ,OR1K_INSN_LF_GE_D ,OR1K_INSN_LF_GT_S - ,OR1K_INSN_LF_GT_D ,OR1K_INSN_LF_LT_S ,OR1K_INSN_LF_LT_D ,OR1K_INSN_LF_LE_S - ,OR1K_INSN_LF_LE_D ,OR1K_INSN_LF_MADD_S ,OR1K_INSN_LF_MADD_D ,OR1K_INSN_LF_CUST1_S - ,OR1K_INSN_LF_CUST1_D + ,OR1K_INSN_LF_ADD_D ,OR1K_INSN_LF_ADD_D32 ,OR1K_INSN_LF_SUB_S ,OR1K_INSN_LF_SUB_D + ,OR1K_INSN_LF_SUB_D32 ,OR1K_INSN_LF_MUL_S ,OR1K_INSN_LF_MUL_D ,OR1K_INSN_LF_MUL_D32 + ,OR1K_INSN_LF_DIV_S ,OR1K_INSN_LF_DIV_D ,OR1K_INSN_LF_DIV_D32 ,OR1K_INSN_LF_REM_S + ,OR1K_INSN_LF_REM_D ,OR1K_INSN_LF_REM_D32 ,OR1K_INSN_LF_ITOF_S ,OR1K_INSN_LF_ITOF_D + ,OR1K_INSN_LF_ITOF_D32 ,OR1K_INSN_LF_FTOI_S ,OR1K_INSN_LF_FTOI_D ,OR1K_INSN_LF_FTOI_D32 + ,OR1K_INSN_LF_EQ_S ,OR1K_INSN_LF_EQ_D ,OR1K_INSN_LF_EQ_D32 ,OR1K_INSN_LF_NE_S + ,OR1K_INSN_LF_NE_D ,OR1K_INSN_LF_NE_D32 ,OR1K_INSN_LF_GE_S ,OR1K_INSN_LF_GE_D + ,OR1K_INSN_LF_GE_D32 ,OR1K_INSN_LF_GT_S ,OR1K_INSN_LF_GT_D ,OR1K_INSN_LF_GT_D32 + ,OR1K_INSN_LF_LT_S ,OR1K_INSN_LF_LT_D ,OR1K_INSN_LF_LT_D32 ,OR1K_INSN_LF_LE_S + ,OR1K_INSN_LF_LE_D ,OR1K_INSN_LF_LE_D32 ,OR1K_INSN_LF_MADD_S ,OR1K_INSN_LF_MADD_D + ,OR1K_INSN_LF_MADD_D32 ,OR1K_INSN_LF_CUST1_S ,OR1K_INSN_LF_CUST1_D ,OR1K_INSN_LF_CUST1_D32 } CGEN_INSN_TYPE;/* Index of `invalid' insn place holder. */ #define CGEN_INSN_INVALID OR1K_INSN_INVALID/* Total number of insns in table. */ -#define MAX_INSNS ((int) OR1K_INSN_LF_CUST1_D + 1) +#define MAX_INSNS ((int) OR1K_INSN_LF_CUST1_D32 + 1)/* This struct records data prior to insertion or after extraction. */ struct cgen_fields
opcodes/or1k-opinst.c +51 -0
113 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v2 2/6 opcodes: Regenerate opcodes for orfp64a32 spec
Hi Stafford,
Quoted 10 lines
opcodes/ChangeLog:
*
or1k-asm.c: Regenerated.
*or1k-desc.c: Regenerated.
*or1k-desc.h: Regenerated.
*or1k-dis.c: Regenerated.
*or1k-ibld.c: Regenerated.
*or1k-opc.c: Regenerated.
*or1k-opc.h: Regenerated.
*or1k-opinst.c: Regenerated.
This part of your patch series is approved. Please commit whenever you are ready.
Cheers
Nick
PATCH v2 3/6 sim/or1k: Regenerate sim for orfp64a32 spec
In reply to Stafford Hornesim/ChangeLog:
* or1k/cpu.c: Regenerate.
* or1k/cpu.h: Regenerate.
* or1k/decode.c: Regenerate.
* or1k/decode.h: Regenerate.
* or1k/model.c: Regenerate.
* or1k/sem-switch.c: Regenerate.
* or1k/sem.c: Regenerate.
--- sim/or1k/cpu.c | 60 +++-- sim/or1k/cpu.h | 115 +++++++++- sim/or1k/decode.c | 302 +++++++++++++++++++------ sim/or1k/decode.h | 16 +- sim/or1k/model.c | 510 ++++++++++++++++++++++++++++++++++++++++++ sim/or1k/sem-switch.c | 296 ++++++++++++++++++++++++ sim/or1k/sem.c | 326 +++++++++++++++++++++++++++ 7 files changed, 1537 insertions(+), 88 deletions(-)
sim/or1k/cpu.c +46 -14
@@ -44,6 +44,38 @@ or1k32bf_h_pc_set (SIM_CPU *current_cpu, USI newval)SET_H_PC (newval); } +/* Get the value of h-spr. */ + +USI +or1k32bf_h_spr_get (SIM_CPU *current_cpu,UINT regno) +{ +return GET_H_SPR (regno); +} + +/* Set a value for h-spr. */ + +void +or1k32bf_h_spr_set (SIM_CPU *current_cpu,UINT regno,USI newval) +{ +SET_H_SPR (regno, newval); +} + +/* Get the value of h-gpr. */ + +USI +or1k32bf_h_gpr_get (SIM_CPU *current_cpu,UINT regno) +{ +return GET_H_GPR (regno); +} + +/* Set a value for h-gpr. */ + +void +or1k32bf_h_gpr_set (SIM_CPU *current_cpu,UINT regno,USI newval) +{ +SET_H_GPR (regno, newval); +} +/* Get the value of h-fsr. */ SF
@@ -60,36 +92,36 @@ or1k32bf_h_fsr_set (SIM_CPU *current_cpu, UINT regno, SF newval)SET_H_FSR (regno, newval); } -/* Get the value of h-spr. */ +/* Get the value of h-fd32r. */ -USI -or1k32bf_h_spr_get (SIM_CPU *current_cpu,UINT regno) +DF +or1k32bf_h_fd32r_get (SIM_CPU *current_cpu,UINT regno) { -return GET_H_SPR (regno); +return GET_H_FD32R (regno); } -/* Set a value for h-spr. */ +/* Set a value for h-fd32r. */ void -or1k32bf_h_spr_set (SIM_CPU *current_cpu,UINT regno,USI newval) +or1k32bf_h_fd32r_set (SIM_CPU *current_cpu,UINT regno,DF newval) { -SET_H_SPR (regno, newval); +SET_H_FD32R (regno, newval); } -/* Get the value of h-gpr. */ +/* Get the value of h-i64r. */ -USI -or1k32bf_h_gpr_get (SIM_CPU *current_cpu,UINT regno) +DI +or1k32bf_h_i64r_get (SIM_CPU *current_cpu,UINT regno) { -return GET_H_GPR (regno); +return GET_H_I64R (regno); } -/* Set a value for h-gpr. */ +/* Set a value for h-i64r. */ void -or1k32bf_h_gpr_set (SIM_CPU *current_cpu,UINT regno,USI newval) +or1k32bf_h_i64r_set (SIM_CPU *current_cpu,UINT regno,DI newval) { -SET_H_GPR (regno, newval); +SET_H_I64R (regno, newval); }/* Get the value of h-sys-vr. */
sim/or1k/cpu.h +110 -5
167 lines not on this page · raw message
sim/or1k/decode.c +238 -64
435 lines not on this page · raw message
sim/or1k/decode.h +11 -5
@@ -60,10 +60,14 @@ typedef enum or1k32bf_insn_type { , OR1K32BF_INSN_L_MACU, OR1K32BF_INSN_L_MSB, OR1K32BF_INSN_L_MSBU, OR1K32BF_INSN_L_CUST1 ,OR1K32BF_INSN_L_CUST2 ,OR1K32BF_INSN_L_CUST3 ,OR1K32BF_INSN_L_CUST4 ,OR1K32BF_INSN_L_CUST5 ,OR1K32BF_INSN_L_CUST6 ,OR1K32BF_INSN_L_CUST7 ,OR1K32BF_INSN_L_CUST8 ,OR1K32BF_INSN_LF_ADD_S - ,OR1K32BF_INSN_LF_SUB_S ,OR1K32BF_INSN_LF_MUL_S ,OR1K32BF_INSN_LF_DIV_S ,OR1K32BF_INSN_LF_REM_S - ,OR1K32BF_INSN_LF_ITOF_S ,OR1K32BF_INSN_LF_FTOI_S ,OR1K32BF_INSN_LF_EQ_S ,OR1K32BF_INSN_LF_NE_S - ,OR1K32BF_INSN_LF_GE_S ,OR1K32BF_INSN_LF_GT_S ,OR1K32BF_INSN_LF_LT_S ,OR1K32BF_INSN_LF_LE_S - ,OR1K32BF_INSN_LF_MADD_S ,OR1K32BF_INSN_LF_CUST1_S ,OR1K32BF_INSN__MAX + ,OR1K32BF_INSN_LF_ADD_D32 ,OR1K32BF_INSN_LF_SUB_S ,OR1K32BF_INSN_LF_SUB_D32 ,OR1K32BF_INSN_LF_MUL_S + ,OR1K32BF_INSN_LF_MUL_D32 ,OR1K32BF_INSN_LF_DIV_S ,OR1K32BF_INSN_LF_DIV_D32 ,OR1K32BF_INSN_LF_REM_S + ,OR1K32BF_INSN_LF_REM_D32 ,OR1K32BF_INSN_LF_ITOF_S ,OR1K32BF_INSN_LF_ITOF_D32 ,OR1K32BF_INSN_LF_FTOI_S + ,OR1K32BF_INSN_LF_FTOI_D32 ,OR1K32BF_INSN_LF_EQ_S ,OR1K32BF_INSN_LF_EQ_D32 ,OR1K32BF_INSN_LF_NE_S + ,OR1K32BF_INSN_LF_NE_D32 ,OR1K32BF_INSN_LF_GE_S ,OR1K32BF_INSN_LF_GE_D32 ,OR1K32BF_INSN_LF_GT_S + ,OR1K32BF_INSN_LF_GT_D32 ,OR1K32BF_INSN_LF_LT_S ,OR1K32BF_INSN_LF_LT_D32 ,OR1K32BF_INSN_LF_LE_S + ,OR1K32BF_INSN_LF_LE_D32 ,OR1K32BF_INSN_LF_MADD_S ,OR1K32BF_INSN_LF_MADD_D32 ,OR1K32BF_INSN_LF_CUST1_S + ,OR1K32BF_INSN_LF_CUST1_D32 ,OR1K32BF_INSN__MAX } OR1K32BF_INSN_TYPE;/* Enum declaration for semantic formats in cpu family or1k32bf. */
@@ -80,7 +84,9 @@ typedef enum or1k32bf_sfmt_type { , OR1K32BF_SFMT_L_XORI, OR1K32BF_SFMT_L_ADDI, OR1K32BF_SFMT_L_ADDIC, OR1K32BF_SFMT_L_MULI ,OR1K32BF_SFMT_L_EXTHS ,OR1K32BF_SFMT_L_CMOV ,OR1K32BF_SFMT_L_SFGTS ,OR1K32BF_SFMT_L_SFGTSI ,OR1K32BF_SFMT_L_MAC ,OR1K32BF_SFMT_L_MACI ,OR1K32BF_SFMT_L_MACU ,OR1K32BF_SFMT_LF_ADD_S - ,OR1K32BF_SFMT_LF_ITOF_S ,OR1K32BF_SFMT_LF_FTOI_S ,OR1K32BF_SFMT_LF_EQ_S ,OR1K32BF_SFMT_LF_MADD_S + ,OR1K32BF_SFMT_LF_ADD_D32 ,OR1K32BF_SFMT_LF_ITOF_S ,OR1K32BF_SFMT_LF_ITOF_D32 ,OR1K32BF_SFMT_LF_FTOI_S + ,OR1K32BF_SFMT_LF_FTOI_D32 ,OR1K32BF_SFMT_LF_EQ_S ,OR1K32BF_SFMT_LF_EQ_D32 ,OR1K32BF_SFMT_LF_MADD_S + ,OR1K32BF_SFMT_LF_MADD_D32 } OR1K32BF_SFMT_TYPE;/* Function unit handlers (user written). */
sim/or1k/model.c +510 -0
730 lines not on this page · raw message
sim/or1k/sem-switch.c +296 -0
406 lines not on this page · raw message
sim/or1k/sem.c +326 -0
436 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v2 3/6 sim/or1k: Regenerate sim for orfp64a32 spec
Quoted 9 lines · Stafford Horne
sim/ChangeLog:
*
or1k/cpu.c: Regenerate.
*or1k/cpu.h: Regenerate.
*or1k/decode.c: Regenerate.
*or1k/decode.h: Regenerate.
*or1k/model.c: Regenerate.
*or1k/sem-switch.c: Regenerate.
*or1k/sem.c: Regenerate.
Kind-of hard to argue with that :)
This is fine with me,
Thanks,
Andrew
Quoted 2,422 lines
--- sim/or1k/cpu.c | 60 +++-- sim/or1k/cpu.h | 115 +++++++++- sim/or1k/decode.c | 302 +++++++++++++++++++------ sim/or1k/decode.h | 16 +- sim/or1k/model.c | 510 ++++++++++++++++++++++++++++++++++++++++++ sim/or1k/sem-switch.c | 296 ++++++++++++++++++++++++ sim/or1k/sem.c | 326 +++++++++++++++++++++++++++ 7 files changed, 1537 insertions(+), 88 deletions(-)sim/or1k/cpu.c +46
-14@@ -44,6 +44,38 @@ or1k32bf_h_pc_set (SIM_CPU *current_cpu, USI newval)SET_H_PC (newval); } +/* Get the value of h-spr. */ + +USI +or1k32bf_h_spr_get (SIM_CPU *current_cpu,UINT regno) +{ +return GET_H_SPR (regno); +} + +/* Set a value for h-spr. */ + +void +or1k32bf_h_spr_set (SIM_CPU *current_cpu,UINT regno,USI newval) +{ +SET_H_SPR (regno, newval); +} + +/* Get the value of h-gpr. */ + +USI +or1k32bf_h_gpr_get (SIM_CPU *current_cpu,UINT regno) +{ +return GET_H_GPR (regno); +} + +/* Set a value for h-gpr. */ + +void +or1k32bf_h_gpr_set (SIM_CPU *current_cpu,UINT regno,USI newval) +{ +SET_H_GPR (regno, newval); +} +/* Get the value of h-fsr. */ SF @@ -60,36 +92,36 @@ or1k32bf_h_fsr_set (SIM_CPU *current_cpu, UINT regno, SF newval)SET_H_FSR (regno, newval); } -/* Get the value of h-spr. */ +/* Get the value of h-fd32r. */ -USI -or1k32bf_h_spr_get (SIM_CPU *current_cpu,UINT regno) +DF +or1k32bf_h_fd32r_get (SIM_CPU *current_cpu,UINT regno) { -return GET_H_SPR (regno); +return GET_H_FD32R (regno); } -/* Set a value for h-spr. */ +/* Set a value for h-fd32r. */ void -or1k32bf_h_spr_set (SIM_CPU *current_cpu,UINT regno,USI newval) +or1k32bf_h_fd32r_set (SIM_CPU *current_cpu,UINT regno,DF newval) { -SET_H_SPR (regno, newval); +SET_H_FD32R (regno, newval); } -/* Get the value of h-gpr. */ +/* Get the value of h-i64r. */ -USI -or1k32bf_h_gpr_get (SIM_CPU *current_cpu,UINT regno) +DI +or1k32bf_h_i64r_get (SIM_CPU *current_cpu,UINT regno) { -return GET_H_GPR (regno); +return GET_H_I64R (regno); } -/* Set a value for h-gpr. */ +/* Set a value for h-i64r. */ void -or1k32bf_h_gpr_set (SIM_CPU *current_cpu,UINT regno,USI newval) +or1k32bf_h_i64r_set (SIM_CPU *current_cpu,UINT regno,DI newval) { -SET_H_GPR (regno, newval); +SET_H_I64R (regno, newval); }/* Get the value of h-sys-vr. */ sim/or1k/cpu.h +110
-5@@ -73,15 +73,31 @@ SET_H_SPR ((((index)) + (ORSI (SLLSI (SPR_GROUP_SYS, 11), SPR_INDEX_SYS_GPR0))),/* Virtual regs. */ +#define GET_H_SPR (index) or1k32bf_h_spr_get_raw (current_cpu, index) +#define SET_H_SPR (index, x) \ +do { \ +or1k32bf_h_spr_set_raw (current_cpu, (index), (x));\ +;} while (0)#define GET_H_FSR (index) SUBWORDSISF (TRUNCSISI (GET_H_GPR (index)))#define SET_H_FSR (index, x) \ do { \ SET_H_GPR ((index), ZEXTSISI (SUBWORDSFSI ((x))));\ ;} while (0) -#define GET_H_SPR (index) or1k32bf_h_spr_get_raw (current_cpu, index) -#define SET_H_SPR (index, x) \ +#define GET_H_FD32R (index) JOINSIDF (GET_H_GPR (index), GET_H_GPR (((index) + (((((index) > (15))) ? (2) : (1)))))) +#define SET_H_FD32R (index, x) \ do { \ -or1k32bf_h_spr_set_raw (current_cpu, (index), (x));\ +{\ +SET_H_GPR ((index), SUBWORDDFSI ((x), 0));\ +SET_H_GPR ((((index)) + ((((((index)) > (15))) ? (2) : (1)))), SUBWORDDFSI ((x), 1));\ +}\ +;} while (0) +#define GET_H_I64R (index) JOINSIDI (GET_H_GPR (index), GET_H_GPR (((index) + (((((index) > (15))) ? (2) : (1)))))) +#define SET_H_I64R (index, x) \ +do { \ +{\ +SET_H_GPR ((index), SUBWORDDISI ((x), 0));\ +SET_H_GPR ((((index)) + ((((((index)) > (15))) ? (2) : (1)))), SUBWORDDISI ((x), 1));\ +}\ ;} while (0)#define GET_H_SYS_VR () GET_H_SPR (ORSI (SLLSI (SPR_GROUP_SYS, 11), SPR_INDEX_SYS_VR))#define SET_H_SYS_VR (x) \@@ -3227,12 +3243,16 @@ or1k32bf_h_spr_field_set_raw (current_cpu, ORSI (SLLSI (SPR_GROUP_SYS, 11), SPR_/* Cover fns for register access. */ USI or1k32bf_h_pc_get (SIM_CPU *);void or1k32bf_h_pc_set (SIM_CPU *,USI ); -SF or1k32bf_h_fsr_get (SIM_CPU *,UINT ); -void or1k32bf_h_fsr_set (SIM_CPU *,UINT ,SF );USI or1k32bf_h_spr_get (SIM_CPU *,UINT );void or1k32bf_h_spr_set (SIM_CPU *,UINT ,USI );USI or1k32bf_h_gpr_get (SIM_CPU *,UINT );void or1k32bf_h_gpr_set (SIM_CPU *,UINT ,USI ); +SF or1k32bf_h_fsr_get (SIM_CPU *,UINT ); +void or1k32bf_h_fsr_set (SIM_CPU *,UINT ,SF ); +DF or1k32bf_h_fd32r_get (SIM_CPU *,UINT ); +void or1k32bf_h_fd32r_set (SIM_CPU *,UINT ,DF ); +DI or1k32bf_h_i64r_get (SIM_CPU *,UINT ); +void or1k32bf_h_i64r_set (SIM_CPU *,UINT ,DI );USI or1k32bf_h_sys_vr_get (SIM_CPU *);void or1k32bf_h_sys_vr_set (SIM_CPU *,USI );USI or1k32bf_h_sys_upr_get (SIM_CPU *);@@ -4978,6 +4998,23 @@ struct scache { f_resv_10_3 =EXTRACT_LSB0_UINT (insn,32 ,10 ,3 ); \ f_op_7_8 =EXTRACT_LSB0_UINT (insn,32 ,7 ,8 ); \ +#define EXTRACT_IFMT_LF_ADD_D32_VARS \ + UINT f_opcode; \ + UINT f_r1; \ + UINT f_r2; \ + UINT f_r3; \ + UINT f_resv_10_3; \ + UINT f_op_7_8; \ + unsigned int length; +#define EXTRACT_IFMT_LF_ADD_D32_CODE \ + length = 4; \ + f_opcode = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \ + f_r1 = EXTRACT_LSB0_UINT (insn, 32, 25, 5); \ + f_r2 = EXTRACT_LSB0_UINT (insn, 32, 20, 5); \ + f_r3 = EXTRACT_LSB0_UINT (insn, 32, 15, 5); \ + f_resv_10_3 = EXTRACT_LSB0_UINT (insn, 32, 10, 3); \ + f_op_7_8 = EXTRACT_LSB0_UINT (insn, 32, 7, 8); \ +#define EXTRACT_IFMT_LF_ITOF_S_VARS \ UINT f_opcode; \ UINT f_r1; \@@ -4995,6 +5032,23 @@ struct scache { f_resv_10_3 =EXTRACT_LSB0_UINT (insn,32 ,10 ,3 ); \ f_op_7_8 =EXTRACT_LSB0_UINT (insn,32 ,7 ,8 ); \ +#define EXTRACT_IFMT_LF_ITOF_D32_VARS \ + UINT f_opcode; \ + UINT f_r1; \ + UINT f_r2; \ + UINT f_r3; \ + UINT f_resv_10_3; \ + UINT f_op_7_8; \ + unsigned int length; +#define EXTRACT_IFMT_LF_ITOF_D32_CODE \ + length = 4; \ + f_opcode = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \ + f_r1 = EXTRACT_LSB0_UINT (insn, 32, 25, 5); \ + f_r2 = EXTRACT_LSB0_UINT (insn, 32, 20, 5); \ + f_r3 = EXTRACT_LSB0_UINT (insn, 32, 15, 5); \ + f_resv_10_3 = EXTRACT_LSB0_UINT (insn, 32, 10, 3); \ + f_op_7_8 = EXTRACT_LSB0_UINT (insn, 32, 7, 8); \ +#define EXTRACT_IFMT_LF_FTOI_S_VARS \ UINT f_opcode; \ UINT f_r1; \@@ -5012,6 +5066,23 @@ struct scache { f_resv_10_3 =EXTRACT_LSB0_UINT (insn,32 ,10 ,3 ); \ f_op_7_8 =EXTRACT_LSB0_UINT (insn,32 ,7 ,8 ); \ +#define EXTRACT_IFMT_LF_FTOI_D32_VARS \ + UINT f_opcode; \ + UINT f_r1; \ + UINT f_r2; \ + UINT f_r3; \ + UINT f_resv_10_3; \ + UINT f_op_7_8; \ + unsigned int length; +#define EXTRACT_IFMT_LF_FTOI_D32_CODE \ + length = 4; \ + f_opcode = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \ + f_r1 = EXTRACT_LSB0_UINT (insn, 32, 25, 5); \ + f_r2 = EXTRACT_LSB0_UINT (insn, 32, 20, 5); \ + f_r3 = EXTRACT_LSB0_UINT (insn, 32, 15, 5); \ + f_resv_10_3 = EXTRACT_LSB0_UINT (insn, 32, 10, 3); \ + f_op_7_8 = EXTRACT_LSB0_UINT (insn, 32, 7, 8); \ +#define EXTRACT_IFMT_LF_EQ_S_VARS \ UINT f_opcode; \ UINT f_r1; \@@ -5029,6 +5100,23 @@ struct scache { f_resv_10_3 =EXTRACT_LSB0_UINT (insn,32 ,10 ,3 ); \ f_op_7_8 =EXTRACT_LSB0_UINT (insn,32 ,7 ,8 ); \ +#define EXTRACT_IFMT_LF_EQ_D32_VARS \ + UINT f_opcode; \ + UINT f_r1; \ + UINT f_r2; \ + UINT f_r3; \ + UINT f_resv_10_3; \ + UINT f_op_7_8; \ + unsigned int length; +#define EXTRACT_IFMT_LF_EQ_D32_CODE \ + length = 4; \ + f_opcode = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \ + f_r1 = EXTRACT_LSB0_UINT (insn, 32, 25, 5); \ + f_r2 = EXTRACT_LSB0_UINT (insn, 32, 20, 5); \ + f_r3 = EXTRACT_LSB0_UINT (insn, 32, 15, 5); \ + f_resv_10_3 = EXTRACT_LSB0_UINT (insn, 32, 10, 3); \ + f_op_7_8 = EXTRACT_LSB0_UINT (insn, 32, 7, 8); \ +#define EXTRACT_IFMT_LF_CUST1_S_VARS \ UINT f_opcode; \ UINT f_resv_25_5; \@@ -5046,6 +5134,23 @@ struct scache { f_resv_10_3 =EXTRACT_LSB0_UINT (insn,32 ,10 ,3 ); \ f_op_7_8 =EXTRACT_LSB0_UINT (insn,32 ,7 ,8 ); \ +#define EXTRACT_IFMT_LF_CUST1_D32_VARS \ + UINT f_opcode; \ + UINT f_resv_25_5; \ + UINT f_r2; \ + UINT f_r3; \ + UINT f_resv_10_3; \ + UINT f_op_7_8; \ + unsigned int length; +#define EXTRACT_IFMT_LF_CUST1_D32_CODE \ + length = 4; \ + f_opcode = EXTRACT_LSB0_UINT (insn, 32, 31, 6); \ + f_resv_25_5 = EXTRACT_LSB0_UINT (insn, 32, 25, 5); \ + f_r2 = EXTRACT_LSB0_UINT (insn, 32, 20, 5); \ + f_r3 = EXTRACT_LSB0_UINT (insn, 32, 15, 5); \ + f_resv_10_3 = EXTRACT_LSB0_UINT (insn, 32, 10, 3); \ + f_op_7_8 = EXTRACT_LSB0_UINT (insn, 32, 7, 8); \ +/* Collection of various things for the trace handler to use. */ typedef struct trace_record {sim/or1k/decode.c +238
-64@@ -144,20 +144,35 @@ static const struct insn_sem or1k32bf_insn_sem[] = { OR1K_INSN_L_CUST7, OR1K32BF_INSN_L_CUST7, OR1K32BF_SFMT_L_MSYNC }, { OR1K_INSN_L_CUST8, OR1K32BF_INSN_L_CUST8, OR1K32BF_SFMT_L_MSYNC }, { OR1K_INSN_LF_ADD_S, OR1K32BF_INSN_LF_ADD_S, OR1K32BF_SFMT_LF_ADD_S }, + { OR1K_INSN_LF_ADD_D32, OR1K32BF_INSN_LF_ADD_D32, OR1K32BF_SFMT_LF_ADD_D32 }, { OR1K_INSN_LF_SUB_S, OR1K32BF_INSN_LF_SUB_S, OR1K32BF_SFMT_LF_ADD_S }, + { OR1K_INSN_LF_SUB_D32, OR1K32BF_INSN_LF_SUB_D32, OR1K32BF_SFMT_LF_ADD_D32 }, { OR1K_INSN_LF_MUL_S, OR1K32BF_INSN_LF_MUL_S, OR1K32BF_SFMT_LF_ADD_S }, + { OR1K_INSN_LF_MUL_D32, OR1K32BF_INSN_LF_MUL_D32, OR1K32BF_SFMT_LF_ADD_D32 }, { OR1K_INSN_LF_DIV_S, OR1K32BF_INSN_LF_DIV_S, OR1K32BF_SFMT_LF_ADD_S }, + { OR1K_INSN_LF_DIV_D32, OR1K32BF_INSN_LF_DIV_D32, OR1K32BF_SFMT_LF_ADD_D32 }, { OR1K_INSN_LF_REM_S, OR1K32BF_INSN_LF_REM_S, OR1K32BF_SFMT_LF_ADD_S }, + { OR1K_INSN_LF_REM_D32, OR1K32BF_INSN_LF_REM_D32, OR1K32BF_SFMT_LF_ADD_D32 }, { OR1K_INSN_LF_ITOF_S, OR1K32BF_INSN_LF_ITOF_S, OR1K32BF_SFMT_LF_ITOF_S }, + { OR1K_INSN_LF_ITOF_D32, OR1K32BF_INSN_LF_ITOF_D32, OR1K32BF_SFMT_LF_ITOF_D32 }, { OR1K_INSN_LF_FTOI_S, OR1K32BF_INSN_LF_FTOI_S, OR1K32BF_SFMT_LF_FTOI_S }, + { OR1K_INSN_LF_FTOI_D32, OR1K32BF_INSN_LF_FTOI_D32, OR1K32BF_SFMT_LF_FTOI_D32 }, { OR1K_INSN_LF_EQ_S, OR1K32BF_INSN_LF_EQ_S, OR1K32BF_SFMT_LF_EQ_S }, + { OR1K_INSN_LF_EQ_D32, OR1K32BF_INSN_LF_EQ_D32, OR1K32BF_SFMT_LF_EQ_D32 }, { OR1K_INSN_LF_NE_S, OR1K32BF_INSN_LF_NE_S, OR1K32BF_SFMT_LF_EQ_S }, + { OR1K_INSN_LF_NE_D32, OR1K32BF_INSN_LF_NE_D32, OR1K32BF_SFMT_LF_EQ_D32 }, { OR1K_INSN_LF_GE_S, OR1K32BF_INSN_LF_GE_S, OR1K32BF_SFMT_LF_EQ_S }, + { OR1K_INSN_LF_GE_D32, OR1K32BF_INSN_LF_GE_D32, OR1K32BF_SFMT_LF_EQ_D32 }, { OR1K_INSN_LF_GT_S, OR1K32BF_INSN_LF_GT_S, OR1K32BF_SFMT_LF_EQ_S }, + { OR1K_INSN_LF_GT_D32, OR1K32BF_INSN_LF_GT_D32, OR1K32BF_SFMT_LF_EQ_D32 }, { OR1K_INSN_LF_LT_S, OR1K32BF_INSN_LF_LT_S, OR1K32BF_SFMT_LF_EQ_S }, + { OR1K_INSN_LF_LT_D32, OR1K32BF_INSN_LF_LT_D32, OR1K32BF_SFMT_LF_EQ_D32 }, { OR1K_INSN_LF_LE_S, OR1K32BF_INSN_LF_LE_S, OR1K32BF_SFMT_LF_EQ_S }, + { OR1K_INSN_LF_LE_D32, OR1K32BF_INSN_LF_LE_D32, OR1K32BF_SFMT_LF_EQ_D32 }, { OR1K_INSN_LF_MADD_S, OR1K32BF_INSN_LF_MADD_S, OR1K32BF_SFMT_LF_MADD_S }, + { OR1K_INSN_LF_MADD_D32, OR1K32BF_INSN_LF_MADD_D32, OR1K32BF_SFMT_LF_MADD_D32 }, { OR1K_INSN_LF_CUST1_S, OR1K32BF_INSN_LF_CUST1_S, OR1K32BF_SFMT_L_MSYNC }, + { OR1K_INSN_LF_CUST1_D32, OR1K32BF_INSN_LF_CUST1_D32, OR1K32BF_SFMT_L_MSYNC }, }; static const struct insn_sem or1k32bf_insn_sem_invalid =@@ -235,7 +250,7 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,CGEN_INSN_WORD insn = base_insn; { -unsigned int val = (((insn >>21 ) & (63 <<5 )) | ((insn >>2 ) & (1 <<4 )) | ((insn >>0 ) & (15 <<0 ))); +unsigned int val = (((insn >>21 ) & (63 <<5 )) | ((insn >>0 ) & (31 <<0 )));switch (val) {case 0 :/* fall through */ @@ -1083,22 +1098,7 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,case 1484 :/* fall through */ case 1485 :/* fall through */ case 1486 :/* fall through */ -case 1487 : - { -unsigned int val = (((insn >>7 ) & (1 <<0 ))); -switch (val) - { -case 0 : -if ((entire_insn &0xfc00ffc0 ) ==0xb8000000 ) - { itype =OR1K32BF_INSN_L_SLLI ; goto extract_sfmt_l_slli; } - itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; -case 1 : -if ((entire_insn &0xfc00ffc0 ) ==0xb8000080 ) - { itype =OR1K32BF_INSN_L_SRAI ; goto extract_sfmt_l_slli; } - itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; -default : itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; - } - } +case 1487 :/* fall through */ case 1488 :/* fall through */ case 1489 :/* fall through */ case 1490 :/* fall through */ @@ -1116,14 +1116,22 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,case 1502 :/* fall through */ case 1503 : { -unsigned int val = (((insn >>7 ) & (1 <<0 ))); +unsigned int val = (((insn >>6 ) & (3 <<0 )));switch (val) {case 0 : +if ((entire_insn &0xfc00ffc0 ) ==0xb8000000 ) + { itype =OR1K32BF_INSN_L_SLLI ; goto extract_sfmt_l_slli; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1 :if ((entire_insn &0xfc00ffc0 ) ==0xb8000040 ) { itype =OR1K32BF_INSN_L_SRLI ; goto extract_sfmt_l_slli; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; -case 1 : +case 2 : +if ((entire_insn &0xfc00ffc0 ) ==0xb8000080 ) + { itype =OR1K32BF_INSN_L_SRAI ; goto extract_sfmt_l_slli; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 3 :if ((entire_insn &0xfc00ffc0 ) ==0xb80000c0 ) { itype =OR1K32BF_INSN_L_RORI ; goto extract_sfmt_l_slli; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;@@ -1258,9 +1266,21 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc, { itype =OR1K32BF_INSN_L_MSBU ; goto extract_sfmt_l_macu; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;case 1600 : -if ((entire_insn &0xfc0007ff ) ==0xc8000000 ) - { itype =OR1K32BF_INSN_LF_ADD_S ; goto extract_sfmt_lf_add_s; } - itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; + { +unsigned int val = (((insn >>5 ) & (7 <<0 ))); +switch (val) + { +case 0 : +if ((entire_insn &0xfc0007ff ) ==0xc8000000 ) + { itype =OR1K32BF_INSN_LF_ADD_S ; goto extract_sfmt_lf_add_s; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 7 : +if ((entire_insn &0xffe007ff ) ==0xc80000e0 ) + { itype =OR1K32BF_INSN_LF_CUST1_D32 ; goto extract_sfmt_l_msync; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +default : itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; + } + }case 1601 :if ((entire_insn &0xfc0007ff ) ==0xc8000001 ) { itype =OR1K32BF_INSN_LF_SUB_S ; goto extract_sfmt_lf_add_s; }@@ -1314,8 +1334,72 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc, { itype =OR1K32BF_INSN_LF_LE_S ; goto extract_sfmt_lf_eq_s; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;case 1616 : -if ((entire_insn &0xffe007ff ) ==0xc80000d0 ) - { itype =OR1K32BF_INSN_LF_CUST1_S ; goto extract_sfmt_l_msync; } + { +unsigned int val = (((insn >>6 ) & (3 <<0 ))); +switch (val) + { +case 0 : +if ((entire_insn &0xfc0007ff ) ==0xc8000010 ) + { itype =OR1K32BF_INSN_LF_ADD_D32 ; goto extract_sfmt_lf_add_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 3 : +if ((entire_insn &0xffe007ff ) ==0xc80000d0 ) + { itype =OR1K32BF_INSN_LF_CUST1_S ; goto extract_sfmt_l_msync; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +default : itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; + } + } +case 1617 : +if ((entire_insn &0xfc0007ff ) ==0xc8000011 ) + { itype =OR1K32BF_INSN_LF_SUB_D32 ; goto extract_sfmt_lf_add_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1618 : +if ((entire_insn &0xfc0007ff ) ==0xc8000012 ) + { itype =OR1K32BF_INSN_LF_MUL_D32 ; goto extract_sfmt_lf_add_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1619 : +if ((entire_insn &0xfc0007ff ) ==0xc8000013 ) + { itype =OR1K32BF_INSN_LF_DIV_D32 ; goto extract_sfmt_lf_add_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1620 : +if ((entire_insn &0xfc00ffff ) ==0xc8000014 ) + { itype =OR1K32BF_INSN_LF_ITOF_D32 ; goto extract_sfmt_lf_itof_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1621 : +if ((entire_insn &0xfc00ffff ) ==0xc8000015 ) + { itype =OR1K32BF_INSN_LF_FTOI_D32 ; goto extract_sfmt_lf_ftoi_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1622 : +if ((entire_insn &0xfc0007ff ) ==0xc8000016 ) + { itype =OR1K32BF_INSN_LF_REM_D32 ; goto extract_sfmt_lf_add_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1623 : +if ((entire_insn &0xfc0007ff ) ==0xc8000017 ) + { itype =OR1K32BF_INSN_LF_MADD_D32 ; goto extract_sfmt_lf_madd_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1624 : +if ((entire_insn &0xffe007ff ) ==0xc8000018 ) + { itype =OR1K32BF_INSN_LF_EQ_D32 ; goto extract_sfmt_lf_eq_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1625 : +if ((entire_insn &0xffe007ff ) ==0xc8000019 ) + { itype =OR1K32BF_INSN_LF_NE_D32 ; goto extract_sfmt_lf_eq_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1626 : +if ((entire_insn &0xffe007ff ) ==0xc800001a ) + { itype =OR1K32BF_INSN_LF_GT_D32 ; goto extract_sfmt_lf_eq_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1627 : +if ((entire_insn &0xffe007ff ) ==0xc800001b ) + { itype =OR1K32BF_INSN_LF_GE_D32 ; goto extract_sfmt_lf_eq_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1628 : +if ((entire_insn &0xffe007ff ) ==0xc800001c ) + { itype =OR1K32BF_INSN_LF_LT_D32 ; goto extract_sfmt_lf_eq_d32; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 1629 : +if ((entire_insn &0xffe007ff ) ==0xc800001d ) + { itype =OR1K32BF_INSN_LF_LE_D32 ; goto extract_sfmt_lf_eq_d32; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;case 1632 :/* fall through */ case 1633 :/* fall through */ @@ -1479,7 +1563,7 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc, itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;case 1800 : { -unsigned int val = (((insn >>7 ) & (1 <<0 ))); +unsigned int val = (((insn >>6 ) & (3 <<0 )));switch (val) {case 0 :@@ -1487,9 +1571,17 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc, { itype =OR1K32BF_INSN_L_SLL ; goto extract_sfmt_l_sll; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;case 1 : +if ((entire_insn &0xfc0007ff ) ==0xe0000048 ) + { itype =OR1K32BF_INSN_L_SRL ; goto extract_sfmt_l_sll; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 2 :if ((entire_insn &0xfc0007ff ) ==0xe0000088 ) { itype =OR1K32BF_INSN_L_SRA ; goto extract_sfmt_l_sll; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 3 : +if ((entire_insn &0xfc0007ff ) ==0xe00000c8 ) + { itype =OR1K32BF_INSN_L_ROR ; goto extract_sfmt_l_sll; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;default : itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; } }@@ -1507,7 +1599,7 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc, itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;case 1804 : { -unsigned int val = (((insn >>7 ) & (1 <<0 ))); +unsigned int val = (((insn >>6 ) & (3 <<0 )));switch (val) {case 0 :@@ -1515,22 +1607,34 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc, { itype =OR1K32BF_INSN_L_EXTHS ; goto extract_sfmt_l_exths; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;case 1 : +if ((entire_insn &0xfc00ffff ) ==0xe000004c ) + { itype =OR1K32BF_INSN_L_EXTBS ; goto extract_sfmt_l_exths; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 2 :if ((entire_insn &0xfc00ffff ) ==0xe000008c ) { itype =OR1K32BF_INSN_L_EXTHZ ; goto extract_sfmt_l_exths; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 3 : +if ((entire_insn &0xfc00ffff ) ==0xe00000cc ) + { itype =OR1K32BF_INSN_L_EXTBZ ; goto extract_sfmt_l_exths; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;default : itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; } }case 1805 : { -unsigned int val = (((insn >>8 ) & (3 <<0 ))); +unsigned int val = (((insn >>7 ) & (3 <<1 )) | ((insn >>6 ) & (1 <<0 )));switch (val) {case 0 :if ((entire_insn &0xfc00ffff ) ==0xe000000d ) { itype =OR1K32BF_INSN_L_EXTWS ; goto extract_sfmt_l_exths; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; -case 3 : +case 1 : +if ((entire_insn &0xfc00ffff ) ==0xe000004d ) + { itype =OR1K32BF_INSN_L_EXTWZ ; goto extract_sfmt_l_exths; } + itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; +case 6 :if ((entire_insn &0xffe007ff ) ==0xe000030d ) { itype =OR1K32BF_INSN_L_MULDU ; goto extract_sfmt_l_muld; } itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;@@ -1557,42 +1661,6 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,default : itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; } } -case 1816 : - { -unsigned int val = (((insn >>7 ) & (1 <<0 ))); -switch (val) - { -case 0 : -if ((entire_insn &0xfc0007ff ) ==0xe0000048 ) - { itype =OR1K32BF_INSN_L_SRL ; goto extract_sfmt_l_sll; } - itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; -case 1 : -if ((entire_insn &0xfc0007ff ) ==0xe00000c8 ) - { itype =OR1K32BF_INSN_L_ROR ; goto extract_sfmt_l_sll; } - itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; -default : itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; - } - } -case 1820 : - { -unsigned int val = (((insn >>7 ) & (1 <<0 ))); -switch (val) - { -case 0 : -if ((entire_insn &0xfc00ffff ) ==0xe000004c ) - { itype =OR1K32BF_INSN_L_EXTBS ; goto extract_sfmt_l_exths; } - itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; -case 1 : -if ((entire_insn &0xfc00ffff ) ==0xe00000cc ) - { itype =OR1K32BF_INSN_L_EXTBZ ; goto extract_sfmt_l_exths; } - itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; -default : itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty; - } - } -case 1821 : -if ((entire_insn &0xfc00ffff ) ==0xe000004d ) - { itype =OR1K32BF_INSN_L_EXTWZ ; goto extract_sfmt_l_exths; } - itype =OR1K32BF_INSN_X_INVALID ; goto extract_sfmt_empty;case 1824 : {unsigned int val = (((insn >>21 ) & (15 <<0 )));@@ -2682,6 +2750,29 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,FLD (f_r1) = f_r1;TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_add_s" ,"f_r2 0x%x" ,'x' , f_r2,"f_r3 0x%x" ,'x' , f_r3,"f_r1 0x%x" ,'x' , f_r1, (char *)0 )); +#undef FLD +return idesc; + } + + extract_sfmt_lf_add_d32: + { +const IDESC *idesc = &or1k32bf_insn_data[itype]; +CGEN_INSN_WORD insn = entire_insn; +#define FLD (f) abuf->fields.sfmt_l_sll.f +UINT f_r1; +UINT f_r2; +UINT f_r3; + + f_r1 =EXTRACT_LSB0_UINT (insn,32 ,25 ,5 ); + f_r2 =EXTRACT_LSB0_UINT (insn,32 ,20 ,5 ); + f_r3 =EXTRACT_LSB0_UINT (insn,32 ,15 ,5 ); + +/* Record the fields for the semantic handler. */ +FLD (f_r2) = f_r2; +FLD (f_r3) = f_r3; +FLD (f_r1) = f_r1; +TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_add_d32" ,"f_r2 0x%x" ,'x' , f_r2,"f_r3 0x%x" ,'x' , f_r3,"f_r1 0x%x" ,'x' , f_r1, (char *)0 )); +#undef FLDreturn idesc; }@@ -2702,6 +2793,26 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,FLD (f_r1) = f_r1;TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_itof_s" ,"f_r2 0x%x" ,'x' , f_r2,"f_r1 0x%x" ,'x' , f_r1, (char *)0 )); +#undef FLD +return idesc; + } + + extract_sfmt_lf_itof_d32: + { +const IDESC *idesc = &or1k32bf_insn_data[itype]; +CGEN_INSN_WORD insn = entire_insn; +#define FLD (f) abuf->fields.sfmt_l_slli.f +UINT f_r1; +UINT f_r2; + + f_r1 =EXTRACT_LSB0_UINT (insn,32 ,25 ,5 ); + f_r2 =EXTRACT_LSB0_UINT (insn,32 ,20 ,5 ); + +/* Record the fields for the semantic handler. */ +FLD (f_r2) = f_r2; +FLD (f_r1) = f_r1; +TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_itof_d32" ,"f_r2 0x%x" ,'x' , f_r2,"f_r1 0x%x" ,'x' , f_r1, (char *)0 )); +#undef FLDreturn idesc; }@@ -2722,6 +2833,26 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,FLD (f_r1) = f_r1;TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_ftoi_s" ,"f_r2 0x%x" ,'x' , f_r2,"f_r1 0x%x" ,'x' , f_r1, (char *)0 )); +#undef FLD +return idesc; + } + + extract_sfmt_lf_ftoi_d32: + { +const IDESC *idesc = &or1k32bf_insn_data[itype]; +CGEN_INSN_WORD insn = entire_insn; +#define FLD (f) abuf->fields.sfmt_l_slli.f +UINT f_r1; +UINT f_r2; + + f_r1 =EXTRACT_LSB0_UINT (insn,32 ,25 ,5 ); + f_r2 =EXTRACT_LSB0_UINT (insn,32 ,20 ,5 ); + +/* Record the fields for the semantic handler. */ +FLD (f_r2) = f_r2; +FLD (f_r1) = f_r1; +TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_ftoi_d32" ,"f_r2 0x%x" ,'x' , f_r2,"f_r1 0x%x" ,'x' , f_r1, (char *)0 )); +#undef FLDreturn idesc; }@@ -2742,6 +2873,26 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,FLD (f_r3) = f_r3;TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_eq_s" ,"f_r2 0x%x" ,'x' , f_r2,"f_r3 0x%x" ,'x' , f_r3, (char *)0 )); +#undef FLD +return idesc; + } + + extract_sfmt_lf_eq_d32: + { +const IDESC *idesc = &or1k32bf_insn_data[itype]; +CGEN_INSN_WORD insn = entire_insn; +#define FLD (f) abuf->fields.sfmt_l_sll.f +UINT f_r2; +UINT f_r3; + + f_r2 =EXTRACT_LSB0_UINT (insn,32 ,20 ,5 ); + f_r3 =EXTRACT_LSB0_UINT (insn,32 ,15 ,5 ); + +/* Record the fields for the semantic handler. */ +FLD (f_r2) = f_r2; +FLD (f_r3) = f_r3; +TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_eq_d32" ,"f_r2 0x%x" ,'x' , f_r2,"f_r3 0x%x" ,'x' , f_r3, (char *)0 )); +#undef FLDreturn idesc; }@@ -2765,6 +2916,29 @@ or1k32bf_decode (SIM_CPU *current_cpu, IADDR pc,FLD (f_r1) = f_r1;TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_madd_s" ,"f_r2 0x%x" ,'x' , f_r2,"f_r3 0x%x" ,'x' , f_r3,"f_r1 0x%x" ,'x' , f_r1, (char *)0 )); +#undef FLD +return idesc; + } + + extract_sfmt_lf_madd_d32: + { +const IDESC *idesc = &or1k32bf_insn_data[itype]; +CGEN_INSN_WORD insn = entire_insn; +#define FLD (f) abuf->fields.sfmt_l_sll.f +UINT f_r1; +UINT f_r2; +UINT f_r3; + + f_r1 =EXTRACT_LSB0_UINT (insn,32 ,25 ,5 ); + f_r2 =EXTRACT_LSB0_UINT (insn,32 ,20 ,5 ); + f_r3 =EXTRACT_LSB0_UINT (insn,32 ,15 ,5 ); + +/* Record the fields for the semantic handler. */ +FLD (f_r2) = f_r2; +FLD (f_r3) = f_r3; +FLD (f_r1) = f_r1; +TRACE_EXTRACT (current_cpu, abuf, (current_cpu, pc,"sfmt_lf_madd_d32" ,"f_r2 0x%x" ,'x' , f_r2,"f_r3 0x%x" ,'x' , f_r3,"f_r1 0x%x" ,'x' , f_r1, (char *)0 )); +#undef FLDreturn idesc; }sim/or1k/decode.h +11
-5@@ -60,10 +60,14 @@ typedef enum or1k32bf_insn_type { , OR1K32BF_INSN_L_MACU, OR1K32BF_INSN_L_MSB, OR1K32BF_INSN_L_MSBU, OR1K32BF_INSN_L_CUST1 ,OR1K32BF_INSN_L_CUST2 ,OR1K32BF_INSN_L_CUST3 ,OR1K32BF_INSN_L_CUST4 ,OR1K32BF_INSN_L_CUST5 ,OR1K32BF_INSN_L_CUST6 ,OR1K32BF_INSN_L_CUST7 ,OR1K32BF_INSN_L_CUST8 ,OR1K32BF_INSN_LF_ADD_S - ,OR1K32BF_INSN_LF_SUB_S ,OR1K32BF_INSN_LF_MUL_S ,OR1K32BF_INSN_LF_DIV_S ,OR1K32BF_INSN_LF_REM_S - ,OR1K32BF_INSN_LF_ITOF_S ,OR1K32BF_INSN_LF_FTOI_S ,OR1K32BF_INSN_LF_EQ_S ,OR1K32BF_INSN_LF_NE_S - ,OR1K32BF_INSN_LF_GE_S ,OR1K32BF_INSN_LF_GT_S ,OR1K32BF_INSN_LF_LT_S ,OR1K32BF_INSN_LF_LE_S - ,OR1K32BF_INSN_LF_MADD_S ,OR1K32BF_INSN_LF_CUST1_S ,OR1K32BF_INSN__MAX + ,OR1K32BF_INSN_LF_ADD_D32 ,OR1K32BF_INSN_LF_SUB_S ,OR1K32BF_INSN_LF_SUB_D32 ,OR1K32BF_INSN_LF_MUL_S + ,OR1K32BF_INSN_LF_MUL_D32 ,OR1K32BF_INSN_LF_DIV_S ,OR1K32BF_INSN_LF_DIV_D32 ,OR1K32BF_INSN_LF_REM_S + ,OR1K32BF_INSN_LF_REM_D32 ,OR1K32BF_INSN_LF_ITOF_S ,OR1K32BF_INSN_LF_ITOF_D32 ,OR1K32BF_INSN_LF_FTOI_S + ,OR1K32BF_INSN_LF_FTOI_D32 ,OR1K32BF_INSN_LF_EQ_S ,OR1K32BF_INSN_LF_EQ_D32 ,OR1K32BF_INSN_LF_NE_S + ,OR1K32BF_INSN_LF_NE_D32 ,OR1K32BF_INSN_LF_GE_S ,OR1K32BF_INSN_LF_GE_D32 ,OR1K32BF_INSN_LF_GT_S + ,OR1K32BF_INSN_LF_GT_D32 ,OR1K32BF_INSN_LF_LT_S ,OR1K32BF_INSN_LF_LT_D32 ,OR1K32BF_INSN_LF_LE_S + ,OR1K32BF_INSN_LF_LE_D32 ,OR1K32BF_INSN_LF_MADD_S ,OR1K32BF_INSN_LF_MADD_D32 ,OR1K32BF_INSN_LF_CUST1_S + ,OR1K32BF_INSN_LF_CUST1_D32 ,OR1K32BF_INSN__MAX } OR1K32BF_INSN_TYPE;/* Enum declaration for semantic formats in cpu family or1k32bf. */ @@ -80,7 +84,9 @@ typedef enum or1k32bf_sfmt_type { , OR1K32BF_SFMT_L_XORI, OR1K32BF_SFMT_L_ADDI, OR1K32BF_SFMT_L_ADDIC, OR1K32BF_SFMT_L_MULI ,OR1K32BF_SFMT_L_EXTHS ,OR1K32BF_SFMT_L_CMOV ,OR1K32BF_SFMT_L_SFGTS ,OR1K32BF_SFMT_L_SFGTSI ,OR1K32BF_SFMT_L_MAC ,OR1K32BF_SFMT_L_MACI ,OR1K32BF_SFMT_L_MACU ,OR1K32BF_SFMT_LF_ADD_S - ,OR1K32BF_SFMT_LF_ITOF_S ,OR1K32BF_SFMT_LF_FTOI_S ,OR1K32BF_SFMT_LF_EQ_S ,OR1K32BF_SFMT_LF_MADD_S + ,OR1K32BF_SFMT_LF_ADD_D32 ,OR1K32BF_SFMT_LF_ITOF_S ,OR1K32BF_SFMT_LF_ITOF_D32 ,OR1K32BF_SFMT_LF_FTOI_S + ,OR1K32BF_SFMT_LF_FTOI_D32 ,OR1K32BF_SFMT_LF_EQ_S ,OR1K32BF_SFMT_LF_EQ_D32 ,OR1K32BF_SFMT_LF_MADD_S + ,OR1K32BF_SFMT_LF_MADD_D32 } OR1K32BF_SFMT_TYPE;/* Function unit handlers (user written). */ sim/or1k/model.c +510
-0@@ -1602,6 +1602,22 @@ model_or1200_lf_add_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_add_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_sub_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1618,6 +1634,22 @@ model_or1200_lf_sub_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_sub_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_mul_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1634,6 +1666,22 @@ model_or1200_lf_mul_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_mul_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_div_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1650,6 +1698,22 @@ model_or1200_lf_div_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_div_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_rem_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1666,6 +1730,22 @@ model_or1200_lf_rem_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_rem_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_itof_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1682,6 +1762,22 @@ model_or1200_lf_itof_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_itof_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_slli.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_ftoi_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1698,6 +1794,22 @@ model_or1200_lf_ftoi_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_ftoi_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_slli.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_eq_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1714,6 +1826,22 @@ model_or1200_lf_eq_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_eq_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_ne_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1730,6 +1858,22 @@ model_or1200_lf_ne_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_ne_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_ge_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1746,6 +1890,22 @@ model_or1200_lf_ge_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_ge_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_gt_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1762,6 +1922,22 @@ model_or1200_lf_gt_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_gt_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_lt_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1778,6 +1954,22 @@ model_or1200_lf_lt_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_lt_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_le_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1794,6 +1986,22 @@ model_or1200_lf_le_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_le_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_madd_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1810,6 +2018,22 @@ model_or1200_lf_madd_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_madd_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200_lf_cust1_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -1826,6 +2050,22 @@ model_or1200_lf_cust1_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200_lf_cust1_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_empty.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_l_j (SIM_CPU *current_cpu,void *sem_arg) {@@ -3394,6 +3634,22 @@ model_or1200nd_lf_add_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_add_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_sub_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3410,6 +3666,22 @@ model_or1200nd_lf_sub_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_sub_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_mul_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3426,6 +3698,22 @@ model_or1200nd_lf_mul_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_mul_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_div_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3442,6 +3730,22 @@ model_or1200nd_lf_div_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_div_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_rem_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3458,6 +3762,22 @@ model_or1200nd_lf_rem_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_rem_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_itof_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3474,6 +3794,22 @@ model_or1200nd_lf_itof_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_itof_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_slli.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_ftoi_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3490,6 +3826,22 @@ model_or1200nd_lf_ftoi_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_ftoi_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_slli.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_eq_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3506,6 +3858,22 @@ model_or1200nd_lf_eq_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_eq_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_ne_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3522,6 +3890,22 @@ model_or1200nd_lf_ne_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_ne_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_ge_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3538,6 +3922,22 @@ model_or1200nd_lf_ge_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_ge_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_gt_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3554,6 +3954,22 @@ model_or1200nd_lf_gt_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_gt_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_lt_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3570,6 +3986,22 @@ model_or1200nd_lf_lt_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_lt_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_le_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3586,6 +4018,22 @@ model_or1200nd_lf_le_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_le_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_madd_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3602,6 +4050,22 @@ model_or1200nd_lf_madd_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_madd_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +static int model_or1200nd_lf_cust1_s (SIM_CPU *current_cpu,void *sem_arg) {@@ -3618,6 +4082,22 @@ model_or1200nd_lf_cust1_s (SIM_CPU *current_cpu, void *sem_arg)#undef FLD } +static int +model_or1200nd_lf_cust1_d32 (SIM_CPU *current_cpu,void *sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_empty.f + const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg); + const IDESC * UNUSED idesc = abuf->idesc; +int cycles =0 ; + { +int referenced =0 ; + int UNUSED insn_referenced = abuf->written; + cycles +=or1k32bf_model_or1200nd_u_exec (current_cpu, idesc,0 , referenced); + } +return cycles; +#undef FLD +} +/* We assume UNIT_NONE == 0 because the tables don't always terminate entries with it. */ @@ -3728,20 +4208,35 @@ static const INSN_TIMING or1200_timing[] = { { OR1K32BF_INSN_L_CUST7, model_or1200_l_cust7, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_L_CUST8, model_or1200_l_cust8, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_ADD_S, model_or1200_lf_add_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_ADD_D32, model_or1200_lf_add_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_SUB_S, model_or1200_lf_sub_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_SUB_D32, model_or1200_lf_sub_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_MUL_S, model_or1200_lf_mul_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_MUL_D32, model_or1200_lf_mul_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_DIV_S, model_or1200_lf_div_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_DIV_D32, model_or1200_lf_div_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_REM_S, model_or1200_lf_rem_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_REM_D32, model_or1200_lf_rem_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_ITOF_S, model_or1200_lf_itof_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_ITOF_D32, model_or1200_lf_itof_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_FTOI_S, model_or1200_lf_ftoi_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_FTOI_D32, model_or1200_lf_ftoi_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_EQ_S, model_or1200_lf_eq_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_EQ_D32, model_or1200_lf_eq_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_NE_S, model_or1200_lf_ne_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_NE_D32, model_or1200_lf_ne_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_GE_S, model_or1200_lf_ge_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_GE_D32, model_or1200_lf_ge_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_GT_S, model_or1200_lf_gt_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_GT_D32, model_or1200_lf_gt_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_LT_S, model_or1200_lf_lt_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_LT_D32, model_or1200_lf_lt_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_LE_S, model_or1200_lf_le_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_LE_D32, model_or1200_lf_le_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_MADD_S, model_or1200_lf_madd_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_MADD_D32, model_or1200_lf_madd_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_CUST1_S, model_or1200_lf_cust1_s, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_CUST1_D32, model_or1200_lf_cust1_d32, { { (int) UNIT_OR1200_U_EXEC, 1, 1 } } }, };/* Model timing data for `or1200nd'. */ @@ -3851,20 +4346,35 @@ static const INSN_TIMING or1200nd_timing[] = { { OR1K32BF_INSN_L_CUST7, model_or1200nd_l_cust7, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_L_CUST8, model_or1200nd_l_cust8, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_ADD_S, model_or1200nd_lf_add_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_ADD_D32, model_or1200nd_lf_add_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_SUB_S, model_or1200nd_lf_sub_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_SUB_D32, model_or1200nd_lf_sub_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_MUL_S, model_or1200nd_lf_mul_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_MUL_D32, model_or1200nd_lf_mul_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_DIV_S, model_or1200nd_lf_div_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_DIV_D32, model_or1200nd_lf_div_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_REM_S, model_or1200nd_lf_rem_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_REM_D32, model_or1200nd_lf_rem_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_ITOF_S, model_or1200nd_lf_itof_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_ITOF_D32, model_or1200nd_lf_itof_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_FTOI_S, model_or1200nd_lf_ftoi_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_FTOI_D32, model_or1200nd_lf_ftoi_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_EQ_S, model_or1200nd_lf_eq_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_EQ_D32, model_or1200nd_lf_eq_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_NE_S, model_or1200nd_lf_ne_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_NE_D32, model_or1200nd_lf_ne_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_GE_S, model_or1200nd_lf_ge_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_GE_D32, model_or1200nd_lf_ge_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_GT_S, model_or1200nd_lf_gt_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_GT_D32, model_or1200nd_lf_gt_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_LT_S, model_or1200nd_lf_lt_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_LT_D32, model_or1200nd_lf_lt_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_LE_S, model_or1200nd_lf_le_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_LE_D32, model_or1200nd_lf_le_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_MADD_S, model_or1200nd_lf_madd_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_MADD_D32, model_or1200nd_lf_madd_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, { OR1K32BF_INSN_LF_CUST1_S, model_or1200nd_lf_cust1_s, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, + { OR1K32BF_INSN_LF_CUST1_D32, model_or1200nd_lf_cust1_d32, { { (int) UNIT_OR1200ND_U_EXEC, 1, 1 } } }, }; #endif /* WITH_PROFILE_MODEL_P */sim/or1k/sem-switch.c +296
-0@@ -136,20 +136,35 @@ This file is part of the GNU simulators. { OR1K32BF_INSN_L_CUST7, && case_sem_INSN_L_CUST7 }, { OR1K32BF_INSN_L_CUST8, && case_sem_INSN_L_CUST8 }, { OR1K32BF_INSN_LF_ADD_S, && case_sem_INSN_LF_ADD_S }, + { OR1K32BF_INSN_LF_ADD_D32, && case_sem_INSN_LF_ADD_D32 }, { OR1K32BF_INSN_LF_SUB_S, && case_sem_INSN_LF_SUB_S }, + { OR1K32BF_INSN_LF_SUB_D32, && case_sem_INSN_LF_SUB_D32 }, { OR1K32BF_INSN_LF_MUL_S, && case_sem_INSN_LF_MUL_S }, + { OR1K32BF_INSN_LF_MUL_D32, && case_sem_INSN_LF_MUL_D32 }, { OR1K32BF_INSN_LF_DIV_S, && case_sem_INSN_LF_DIV_S }, + { OR1K32BF_INSN_LF_DIV_D32, && case_sem_INSN_LF_DIV_D32 }, { OR1K32BF_INSN_LF_REM_S, && case_sem_INSN_LF_REM_S }, + { OR1K32BF_INSN_LF_REM_D32, && case_sem_INSN_LF_REM_D32 }, { OR1K32BF_INSN_LF_ITOF_S, && case_sem_INSN_LF_ITOF_S }, + { OR1K32BF_INSN_LF_ITOF_D32, && case_sem_INSN_LF_ITOF_D32 }, { OR1K32BF_INSN_LF_FTOI_S, && case_sem_INSN_LF_FTOI_S }, + { OR1K32BF_INSN_LF_FTOI_D32, && case_sem_INSN_LF_FTOI_D32 }, { OR1K32BF_INSN_LF_EQ_S, && case_sem_INSN_LF_EQ_S }, + { OR1K32BF_INSN_LF_EQ_D32, && case_sem_INSN_LF_EQ_D32 }, { OR1K32BF_INSN_LF_NE_S, && case_sem_INSN_LF_NE_S }, + { OR1K32BF_INSN_LF_NE_D32, && case_sem_INSN_LF_NE_D32 }, { OR1K32BF_INSN_LF_GE_S, && case_sem_INSN_LF_GE_S }, + { OR1K32BF_INSN_LF_GE_D32, && case_sem_INSN_LF_GE_D32 }, { OR1K32BF_INSN_LF_GT_S, && case_sem_INSN_LF_GT_S }, + { OR1K32BF_INSN_LF_GT_D32, && case_sem_INSN_LF_GT_D32 }, { OR1K32BF_INSN_LF_LT_S, && case_sem_INSN_LF_LT_S }, + { OR1K32BF_INSN_LF_LT_D32, && case_sem_INSN_LF_LT_D32 }, { OR1K32BF_INSN_LF_LE_S, && case_sem_INSN_LF_LE_S }, + { OR1K32BF_INSN_LF_LE_D32, && case_sem_INSN_LF_LE_D32 }, { OR1K32BF_INSN_LF_MADD_S, && case_sem_INSN_LF_MADD_S }, + { OR1K32BF_INSN_LF_MADD_D32, && case_sem_INSN_LF_MADD_D32 }, { OR1K32BF_INSN_LF_CUST1_S, && case_sem_INSN_LF_CUST1_S }, + { OR1K32BF_INSN_LF_CUST1_D32, && case_sem_INSN_LF_CUST1_D32 }, { 0, 0 } };int i;@@ -2646,6 +2661,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"fsr" ,'f' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_ADD_D32) : /* lf.add.d $rDD32F,$rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } +#undef FLD }NEXT (vpc);@@ -2665,6 +2699,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"fsr" ,'f' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_SUB_D32) : /* lf.sub.d $rDD32F,$rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } +#undef FLD }NEXT (vpc);@@ -2684,6 +2737,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"fsr" ,'f' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_MUL_D32) : /* lf.mul.d $rDD32F,$rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } +#undef FLD }NEXT (vpc);@@ -2703,6 +2775,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"fsr" ,'f' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_DIV_D32) : /* lf.div.d $rDD32F,$rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->divdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } +#undef FLD }NEXT (vpc);@@ -2722,6 +2813,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"fsr" ,'f' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_REM_D32) : /* lf.rem.d $rDD32F,$rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->remdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } +#undef FLD }NEXT (vpc);@@ -2741,6 +2851,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"fsr" ,'f' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_ITOF_D32) : /* lf.itof.d $rDD32F,$rADI */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_slli.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->floatdidf (CGEN_CPU_FPU (current_cpu), (GET_H_SYS_FPCSR_RM () ==0 ) ? (1 ) : (GET_H_SYS_FPCSR_RM () ==1 ) ? (3 ) : (GET_H_SYS_FPCSR_RM () ==2 ) ? (4 ) : (5 ),GET_H_I64R (FLD (f_r2))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } +#undef FLD }NEXT (vpc);@@ -2760,6 +2889,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"gpr" ,'x' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_FTOI_D32) : /* lf.ftoi.d $rDDI,$rAD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_slli.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DI opval =CGEN_CPU_FPU (current_cpu)->ops->fixdfdi (CGEN_CPU_FPU (current_cpu), (GET_H_SYS_FPCSR_RM () ==0 ) ? (1 ) : (GET_H_SYS_FPCSR_RM () ==1 ) ? (3 ) : (GET_H_SYS_FPCSR_RM () ==2 ) ? (4 ) : (5 ),GET_H_FD32R (FLD (f_r2))); +SET_H_I64R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"i64r" ,'D' , opval); + } +#undef FLD }NEXT (vpc);@@ -2779,6 +2927,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_EQ_D32) : /* lf.sfeq.d $rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->eqdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } +#undef FLD }NEXT (vpc);@@ -2798,6 +2965,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_NE_D32) : /* lf.sfne.d $rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->nedf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } +#undef FLD }NEXT (vpc);@@ -2817,6 +3003,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_GE_D32) : /* lf.sfge.d $rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->gedf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } +#undef FLD }NEXT (vpc);@@ -2836,6 +3041,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_GT_D32) : /* lf.sfgt.d $rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->gtdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } +#undef FLD }NEXT (vpc);@@ -2855,6 +3079,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_LT_D32) : /* lf.sflt.d $rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->ltdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } +#undef FLD }NEXT (vpc);@@ -2874,6 +3117,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_LE_D32) : /* lf.sfle.d $rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->ledf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } +#undef FLD }NEXT (vpc);@@ -2893,6 +3155,25 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE);CGEN_TRACE_RESULT (current_cpu, abuf,"fsr" ,'f' , opval); } +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_MADD_D32) : /* lf.madd.d $rDD32F,$rAD32F,$rBD32F */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_l_sll.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu),CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))),GET_H_FD32R (FLD (f_r1))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } +#undef FLD }NEXT (vpc);@@ -2908,6 +3189,21 @@ or1k32bf_exception (current_cpu, pc, EXCEPT_RANGE); ((void )0 );/*nop*/ +#undef FLD +} +NEXT (vpc); + + CASE (sem, INSN_LF_CUST1_D32) : /* lf.cust1.d */ +{ +SEM_ARG sem_arg =SEM_SEM_ARG (vpc, sc); +ARGBUF *abuf =SEM_ARGBUF (sem_arg); +#define FLD (f) abuf->fields.sfmt_empty.f + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; + vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + +((void )0 );/*nop*/ +#undef FLD }NEXT (vpc);sim/or1k/sem.c +326
-0@@ -2694,6 +2694,27 @@ SEM_FN_NAME (or1k32bf,lf_add_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-add-d32: lf.add.d $rDD32F,$rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_add_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } + +return vpc; +#undef FLD +} +/* lf-sub-s: lf.sub.s $rDSF,$rASF,$rBSF */ static SEM_PC@@ -2715,6 +2736,27 @@ SEM_FN_NAME (or1k32bf,lf_sub_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-sub-d32: lf.sub.d $rDD32F,$rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_sub_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->subdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } + +return vpc; +#undef FLD +} +/* lf-mul-s: lf.mul.s $rDSF,$rASF,$rBSF */ static SEM_PC@@ -2736,6 +2778,27 @@ SEM_FN_NAME (or1k32bf,lf_mul_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-mul-d32: lf.mul.d $rDD32F,$rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_mul_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } + +return vpc; +#undef FLD +} +/* lf-div-s: lf.div.s $rDSF,$rASF,$rBSF */ static SEM_PC@@ -2757,6 +2820,27 @@ SEM_FN_NAME (or1k32bf,lf_div_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-div-d32: lf.div.d $rDD32F,$rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_div_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->divdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } + +return vpc; +#undef FLD +} +/* lf-rem-s: lf.rem.s $rDSF,$rASF,$rBSF */ static SEM_PC@@ -2778,6 +2862,27 @@ SEM_FN_NAME (or1k32bf,lf_rem_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-rem-d32: lf.rem.d $rDD32F,$rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_rem_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->remdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } + +return vpc; +#undef FLD +} +/* lf-itof-s: lf.itof.s $rDSF,$rA */ static SEM_PC@@ -2799,6 +2904,27 @@ SEM_FN_NAME (or1k32bf,lf_itof_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-itof-d32: lf.itof.d $rDD32F,$rADI */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_itof_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_slli.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->floatdidf (CGEN_CPU_FPU (current_cpu), (GET_H_SYS_FPCSR_RM () ==0 ) ? (1 ) : (GET_H_SYS_FPCSR_RM () ==1 ) ? (3 ) : (GET_H_SYS_FPCSR_RM () ==2 ) ? (4 ) : (5 ),GET_H_I64R (FLD (f_r2))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } + +return vpc; +#undef FLD +} +/* lf-ftoi-s: lf.ftoi.s $rD,$rASF */ static SEM_PC@@ -2820,6 +2946,27 @@ SEM_FN_NAME (or1k32bf,lf_ftoi_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-ftoi-d32: lf.ftoi.d $rDDI,$rAD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_ftoi_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_slli.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DI opval =CGEN_CPU_FPU (current_cpu)->ops->fixdfdi (CGEN_CPU_FPU (current_cpu), (GET_H_SYS_FPCSR_RM () ==0 ) ? (1 ) : (GET_H_SYS_FPCSR_RM () ==1 ) ? (3 ) : (GET_H_SYS_FPCSR_RM () ==2 ) ? (4 ) : (5 ),GET_H_FD32R (FLD (f_r2))); +SET_H_I64R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"i64r" ,'D' , opval); + } + +return vpc; +#undef FLD +} +/* lf-eq-s: lf.sfeq.s $rASF,$rBSF */ static SEM_PC@@ -2841,6 +2988,27 @@ SEM_FN_NAME (or1k32bf,lf_eq_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-eq-d32: lf.sfeq.d $rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_eq_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->eqdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } + +return vpc; +#undef FLD +} +/* lf-ne-s: lf.sfne.s $rASF,$rBSF */ static SEM_PC@@ -2862,6 +3030,27 @@ SEM_FN_NAME (or1k32bf,lf_ne_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-ne-d32: lf.sfne.d $rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_ne_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->nedf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } + +return vpc; +#undef FLD +} +/* lf-ge-s: lf.sfge.s $rASF,$rBSF */ static SEM_PC@@ -2883,6 +3072,27 @@ SEM_FN_NAME (or1k32bf,lf_ge_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-ge-d32: lf.sfge.d $rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_ge_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->gedf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } + +return vpc; +#undef FLD +} +/* lf-gt-s: lf.sfgt.s $rASF,$rBSF */ static SEM_PC@@ -2904,6 +3114,27 @@ SEM_FN_NAME (or1k32bf,lf_gt_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-gt-d32: lf.sfgt.d $rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_gt_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->gtdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } + +return vpc; +#undef FLD +} +/* lf-lt-s: lf.sflt.s $rASF,$rBSF */ static SEM_PC@@ -2925,6 +3156,27 @@ SEM_FN_NAME (or1k32bf,lf_lt_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-lt-d32: lf.sflt.d $rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_lt_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->ltdf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } + +return vpc; +#undef FLD +} +/* lf-le-s: lf.sfle.s $rASF,$rBSF */ static SEM_PC@@ -2946,6 +3198,27 @@ SEM_FN_NAME (or1k32bf,lf_le_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-le-d32: lf.sfle.d $rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_le_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +BI opval =CGEN_CPU_FPU (current_cpu)->ops->ledf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))); +SET_H_SYS_SR_F (opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"sys-sr-f" ,'x' , opval); + } + +return vpc; +#undef FLD +} +/* lf-madd-s: lf.madd.s $rDSF,$rASF,$rBSF */ static SEM_PC@@ -2967,6 +3240,27 @@ SEM_FN_NAME (or1k32bf,lf_madd_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-madd-d32: lf.madd.d $rDD32F,$rAD32F,$rBD32F */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_madd_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_l_sll.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + + { +DF opval =CGEN_CPU_FPU (current_cpu)->ops->adddf (CGEN_CPU_FPU (current_cpu),CGEN_CPU_FPU (current_cpu)->ops->muldf (CGEN_CPU_FPU (current_cpu),GET_H_FD32R (FLD (f_r2)),GET_H_FD32R (FLD (f_r3))),GET_H_FD32R (FLD (f_r1))); +SET_H_FD32R (FLD (f_r1), opval); +CGEN_TRACE_RESULT (current_cpu, abuf,"fd32r" ,'f' , opval); + } + +return vpc; +#undef FLD +} +/* lf-cust1-s: lf.cust1.s $rASF,$rBSF */ static SEM_PC@@ -2984,6 +3278,23 @@ SEM_FN_NAME (or1k32bf,lf_cust1_s) (SIM_CPU *current_cpu, SEM_ARG sem_arg)#undef FLD } +/* lf-cust1-d32: lf.cust1.d */ + +static SEM_PC +SEM_FN_NAME (or1k32bf ,lf_cust1_d32 ) (SIM_CPU *current_cpu,SEM_ARG sem_arg) +{ +#define FLD (f) abuf->fields.sfmt_empty.f +ARGBUF *abuf =SEM_ARGBUF (sem_arg); + int UNUSED written = 0; + IADDR UNUSED pc = abuf->addr; +SEM_PC vpc =SEM_NEXT_VPC (sem_arg, pc,4 ); + +((void )0 );/*nop*/ + +return vpc; +#undef FLD +} +/* Table of all semantic fns. */ static const struct sem_fn_desc sem_fns[] = {@@ -3091,20 +3402,35 @@ static const struct sem_fn_desc sem_fns[] = { { OR1K32BF_INSN_L_CUST7, SEM_FN_NAME (or1k32bf,l_cust7) }, { OR1K32BF_INSN_L_CUST8, SEM_FN_NAME (or1k32bf,l_cust8) }, { OR1K32BF_INSN_LF_ADD_S, SEM_FN_NAME (or1k32bf,lf_add_s) }, + { OR1K32BF_INSN_LF_ADD_D32, SEM_FN_NAME (or1k32bf,lf_add_d32) }, { OR1K32BF_INSN_LF_SUB_S, SEM_FN_NAME (or1k32bf,lf_sub_s) }, + { OR1K32BF_INSN_LF_SUB_D32, SEM_FN_NAME (or1k32bf,lf_sub_d32) }, { OR1K32BF_INSN_LF_MUL_S, SEM_FN_NAME (or1k32bf,lf_mul_s) }, + { OR1K32BF_INSN_LF_MUL_D32, SEM_FN_NAME (or1k32bf,lf_mul_d32) }, { OR1K32BF_INSN_LF_DIV_S, SEM_FN_NAME (or1k32bf,lf_div_s) }, + { OR1K32BF_INSN_LF_DIV_D32, SEM_FN_NAME (or1k32bf,lf_div_d32) }, { OR1K32BF_INSN_LF_REM_S, SEM_FN_NAME (or1k32bf,lf_rem_s) }, + { OR1K32BF_INSN_LF_REM_D32, SEM_FN_NAME (or1k32bf,lf_rem_d32) }, { OR1K32BF_INSN_LF_ITOF_S, SEM_FN_NAME (or1k32bf,lf_itof_s) }, + { OR1K32BF_INSN_LF_ITOF_D32, SEM_FN_NAME (or1k32bf,lf_itof_d32) }, { OR1K32BF_INSN_LF_FTOI_S, SEM_FN_NAME (or1k32bf,lf_ftoi_s) }, + { OR1K32BF_INSN_LF_FTOI_D32, SEM_FN_NAME (or1k32bf,lf_ftoi_d32) }, { OR1K32BF_INSN_LF_EQ_S, SEM_FN_NAME (or1k32bf,lf_eq_s) }, + { OR1K32BF_INSN_LF_EQ_D32, SEM_FN_NAME (or1k32bf,lf_eq_d32) }, { OR1K32BF_INSN_LF_NE_S, SEM_FN_NAME (or1k32bf,lf_ne_s) }, + { OR1K32BF_INSN_LF_NE_D32, SEM_FN_NAME (or1k32bf,lf_ne_d32) }, { OR1K32BF_INSN_LF_GE_S, SEM_FN_NAME (or1k32bf,lf_ge_s) }, + { OR1K32BF_INSN_LF_GE_D32, SEM_FN_NAME (or1k32bf,lf_ge_d32) }, { OR1K32BF_INSN_LF_GT_S, SEM_FN_NAME (or1k32bf,lf_gt_s) }, + { OR1K32BF_INSN_LF_GT_D32, SEM_FN_NAME (or1k32bf,lf_gt_d32) }, { OR1K32BF_INSN_LF_LT_S, SEM_FN_NAME (or1k32bf,lf_lt_s) }, + { OR1K32BF_INSN_LF_LT_D32, SEM_FN_NAME (or1k32bf,lf_lt_d32) }, { OR1K32BF_INSN_LF_LE_S, SEM_FN_NAME (or1k32bf,lf_le_s) }, + { OR1K32BF_INSN_LF_LE_D32, SEM_FN_NAME (or1k32bf,lf_le_d32) }, { OR1K32BF_INSN_LF_MADD_S, SEM_FN_NAME (or1k32bf,lf_madd_s) }, + { OR1K32BF_INSN_LF_MADD_D32, SEM_FN_NAME (or1k32bf,lf_madd_d32) }, { OR1K32BF_INSN_LF_CUST1_S, SEM_FN_NAME (or1k32bf,lf_cust1_s) }, + { OR1K32BF_INSN_LF_CUST1_D32, SEM_FN_NAME (or1k32bf,lf_cust1_d32) }, { 0, 0 } };Signature · 1 line
2.19.1
PATCH v2 3/6 sim/or1k: Regenerate sim for orfp64a32 spec
Quoted 12 lines · Andrew Burgess
Quoted 9 lines · Stafford Horne
sim/ChangeLog:
*
or1k/cpu.c: Regenerate.
*or1k/cpu.h: Regenerate.
*or1k/decode.c: Regenerate.
*or1k/decode.h: Regenerate.
*or1k/model.c: Regenerate.
*or1k/sem-switch.c: Regenerate.
*or1k/sem.c: Regenerate.
Quoted 3 lines
Kind-of hard to argue with that :)
This is fine with me,
Thanks, actually after some recent reviews of the spec that this is implementing we may be having a revision to how we encode some of these instructions.
Thread for those interested:
- https://lists.librecores.org/pipermail/openrisc/2019-April/001958.html
I will have to make some revisions on this and will submit the series again in a few weeks.
-Stafford
PATCH v2 4/6 sim/common: Wire in df/di conversion
In reply to Stafford HorneUp until now these have not been used in any CGEN targets, add them as they are now used by OpenRISC.
sim/common/ChangeLog:
* cgen-accfp.c (floatdidf, fixdfdi): New functions. (cgen_init_accurate_fpu): Add floatdidf and fixdfdi.
--- sim/common/cgen-accfp.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
sim/common/cgen-accfp.c +24 -0
@@ -349,6 +349,17 @@ floatsidf (CGEN_FPU* fpu, int how UNUSED, SI x)return res; } +static DF +floatdidf (CGEN_FPU* fpu, int how UNUSED, DI x) +{ +sim_fpu ans; +unsigned64 res; + +sim_fpu_i64to (&ans, x, sim_fpu_round_near); +sim_fpu_to64 (&res, &ans); +return res; +} +static SF ufloatsisf (CGEN_FPU* fpu, int how UNUSED, USI x) {
@@ -382,6 +393,17 @@ fixdfsi (CGEN_FPU* fpu, int how UNUSED, DF x)return res; } +static DI +fixdfdi (CGEN_FPU* fpu, int how UNUSED, DF x) +{ +sim_fpu op1; +unsigned64 res; + +sim_fpu_64to (&op1, x); +sim_fpu_to64i (&res, &op1, sim_fpu_round_near); +return res; +} +static USI ufixsfsi (CGEN_FPU* fpu, int how UNUSED, SF x) {
@@ -739,8 +761,10 @@ cgen_init_accurate_fpu (SIM_CPU* cpu, CGEN_FPU* fpu, CGEN_FPU_ERROR_FN* error) o->ftruncdfsf = ftruncdfsf; o->floatsisf = floatsisf; o->floatsidf = floatsidf; + o->floatdidf = floatdidf; o->ufloatsisf = ufloatsisf; o->fixsfsi = fixsfsi; o->fixdfsi = fixdfsi; + o->fixdfdi = fixdfdi; o->ufixsfsi = ufixsfsi; }
Signature · 1 line
2.19.1
PATCH v2 4/6 sim/common: Wire in df/di conversion
Quoted 7 lines · Stafford Horne
Up until now these have not been used in any CGEN targets, add them as they are now used by OpenRISC.
sim/common/ChangeLog:
*
cgen-accfp.c(floatdidf, fixdfdi): New functions. (cgen_init_accurate_fpu): Add floatdidf and fixdfdi.
This is fine.
thanks,
Andrew
Quoted 58 lines
--- sim/common/cgen-accfp.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)sim/common/cgen-accfp.c +24
-0@@ -349,6 +349,17 @@ floatsidf (CGEN_FPU* fpu, int how UNUSED, SI x)return res; } +static DF +floatdidf (CGEN_FPU* fpu, int how UNUSED, DI x) +{ +sim_fpu ans; +unsigned64 res; + +sim_fpu_i64to (&ans, x, sim_fpu_round_near); +sim_fpu_to64 (&res, &ans); +return res; +} +static SF ufloatsisf (CGEN_FPU* fpu, int how UNUSED, USI x) {@@ -382,6 +393,17 @@ fixdfsi (CGEN_FPU* fpu, int how UNUSED, DF x)return res; } +static DI +fixdfdi (CGEN_FPU* fpu, int how UNUSED, DF x) +{ +sim_fpu op1; +unsigned64 res; + +sim_fpu_64to (&op1, x); +sim_fpu_to64i (&res, &op1, sim_fpu_round_near); +return res; +} +static USI ufixsfsi (CGEN_FPU* fpu, int how UNUSED, SF x) {@@ -739,8 +761,10 @@ cgen_init_accurate_fpu (SIM_CPU* cpu, CGEN_FPU* fpu, CGEN_FPU_ERROR_FN* error) o->ftruncdfsf = ftruncdfsf; o->floatsisf = floatsisf; o->floatsidf = floatsidf; + o->floatdidf = floatdidf; o->ufloatsisf = ufloatsisf; o->fixsfsi = fixsfsi; o->fixdfsi = fixdfsi; + o->fixdfdi = fixdfdi; o->ufixsfsi = ufixsfsi; }Signature · 1 line
2.19.1
PATCH v2 5/6 sim/or1k: Add test for 64-bit fpu operations
In reply to Stafford HorneThis is a very basic test but it ensure the machine is wired up correctly and that the assembler works.
sim/testsuite/sim/or1k/ChangeLog:
* fpu64a32.S: New file.
--- sim/testsuite/sim/or1k/fpu64a32.S | 172 ++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 sim/testsuite/sim/or1k/fpu64a32.S
sim/testsuite/sim/or1k/fpu64a32.S new file +172 -0
@@ -0,0 +1,172 @@ +/* Tests some basic fpu instructions. + + Copyright (C) 2017-2019 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +# mach: or1k +# output: report(0x400921f9);\n +# output: report(0xf01b866e);\n +# output: report(0x4005bf09);\n +# output: report(0x95aaf790);\n +# output: report(0x00000000);\n +# output: report(0x00001234);\n +# output: \n +# output: report(0x40b23400);\n +# output: report(0x00000000);\n +# output: report(0x40b23400);\n +# output: report(0x00000000);\n +# output: \n +# output: report(0x40177081);\n +# output: report(0xc2e33eff);\n +# output: report(0x400921f9);\n +# output: report(0xf01b866e);\n +# output: \n +# output: report(0x40211456);\n +# output: report(0x587dfabf);\n +# output: report(0x400921f9);\n +# output: report(0xf01b866d);\n +# output: \n +# output: report(0x00000001);\n +# output: \n +# output: WARNING: ignoring fpu error caught in fast mode.\n +# output: report(0x00000000);\n +# output: \n +# output: exit(0)\n + +#include "or1k-asm-test-helpers.h" + + STANDARD_TEST_ENVIRONMENT + + .section .exception_vectors + + /* Floating point exception. */ + .org 0xd00 + + /* The handling is a bit dubious at present. We just patch the + instruction with l.nop and restart. This will go wrong in branch + delay slots. But we don't have those in this test. */ + l.addi r1, r1, -EXCEPTION_STACK_SKIP_SIZE + PUSH r2 + PUSH r3 + /* Save the address of the instruction that caused the problem. */ + MOVE_FROM_SPR r2, SPR_EPCR_BASE + LOAD_IMMEDIATE r3, 0x15000000 /* Opcode for l.nop */ + l.sw -4(r2), r3 + POP r3 + POP r2 + l.addi r1, r1, EXCEPTION_STACK_SKIP_SIZE + l.rfe + + .section .data + .align 4 + .type pi, @object + .size pi, 8 +anchor: +pi: + .double 3.14159 + + .type e, @object + .size e, 8 +e: + .double 2.71828 + + .type large, @object + .size large, 8 +large: + .long 0 + .long 0x1234 + + .section .text +start_tests: + PUSH LINK_REGISTER_R9 + + /* Test lf.itof.d int to double conversion. Setting up: + * r11 pointer to data + * r12,r13 pi as double + * r14,r15 e as double + * r16,r17 a long long + */ + l.ori r11, r0, ha(anchor) + l.addi r11, r11, lo(anchor) + l.lwz r12, 0(r11) + l.lwz r13, 4(r11) + + l.lwz r14, 8(r11) + l.lwz r15, 12(r11) + + l.lwz r16, 16(r11) + l.lwz r18, 20(r11) + + /* Output to ensure we loaded it correctly. */ + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + + REPORT_REG_TO_CONSOLE r14 + REPORT_REG_TO_CONSOLE r15 + + REPORT_REG_TO_CONSOLE r16 + REPORT_REG_TO_CONSOLE r18 + PRINT_NEWLINE_TO_CONSOLE + + /* Convert the big long to a double. */ + lf.itof.d r16, r16 + REPORT_REG_TO_CONSOLE r16 + REPORT_REG_TO_CONSOLE r18 + + /* Convert the double back to a long, it should match before. */ + lf.ftoi.d r16, r16 + lf.itof.d r16, r16 + + REPORT_REG_TO_CONSOLE r16 + REPORT_REG_TO_CONSOLE r18 + + PRINT_NEWLINE_TO_CONSOLE + + /* Add and subtract some double values. */ + lf.add.d r12, r12, r14 + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + + lf.sub.d r12, r12, r14 + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + PRINT_NEWLINE_TO_CONSOLE + + /* Multiply and divide double values. */ + lf.mul.d r12, r12, r14 + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + + lf.div.d r12, r12, r14 + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + PRINT_NEWLINE_TO_CONSOLE + + /* Test lf.sfge.s set flag if r6 >= r10. */ + lf.sfge.d r12, r14 + MOVE_FROM_SPR r2, SPR_SR + REPORT_BIT_TO_CONSOLE r2, SPR_SR_F + PRINT_NEWLINE_TO_CONSOLE + + /* Test raising an exception by dividing by 0. */ + MOVE_FROM_SPR r2, SPR_FPCSR + l.ori r2, r2, 0x1 + MOVE_TO_SPR SPR_FPCSR, r2 +div0: lf.div.d r2, r12, r0 + REPORT_EXCEPTION div0 + PRINT_NEWLINE_TO_CONSOLE + + POP LINK_REGISTER_R9 + RETURN_TO_LINK_REGISTER_R9
Signature · 1 line
2.19.1
PATCH v2 5/6 sim/or1k: Add test for 64-bit fpu operations
Quoted 6 lines · Stafford Horne
This is a very basic test but it ensure the machine is wired up correctly and that the assembler works.
sim/testsuite/sim/or1k/ChangeLog:
*
fpu64a32.S: New file.
This is fine.
Thanks,
Andrew
Quoted 186 lines
--- sim/testsuite/sim/or1k/fpu64a32.S | 172 ++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 sim/testsuite/sim/or1k/fpu64a32.Ssim/testsuite/sim/or1k/fpu64a32.S new file +172
-0@@ -0,0 +1,172 @@ +/* Tests some basic fpu instructions. + + Copyright (C) 2017-2019 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +# mach: or1k +# output: report(0x400921f9);\n +# output: report(0xf01b866e);\n +# output: report(0x4005bf09);\n +# output: report(0x95aaf790);\n +# output: report(0x00000000);\n +# output: report(0x00001234);\n +# output: \n +# output: report(0x40b23400);\n +# output: report(0x00000000);\n +# output: report(0x40b23400);\n +# output: report(0x00000000);\n +# output: \n +# output: report(0x40177081);\n +# output: report(0xc2e33eff);\n +# output: report(0x400921f9);\n +# output: report(0xf01b866e);\n +# output: \n +# output: report(0x40211456);\n +# output: report(0x587dfabf);\n +# output: report(0x400921f9);\n +# output: report(0xf01b866d);\n +# output: \n +# output: report(0x00000001);\n +# output: \n +# output: WARNING: ignoring fpu error caught in fast mode.\n +# output: report(0x00000000);\n +# output: \n +# output: exit(0)\n + +#include "or1k-asm-test-helpers.h" + + STANDARD_TEST_ENVIRONMENT + + .section .exception_vectors + + /* Floating point exception. */ + .org 0xd00 + + /* The handling is a bit dubious at present. We just patch the + instruction with l.nop and restart. This will go wrong in branch + delay slots. But we don't have those in this test. */ + l.addi r1, r1, -EXCEPTION_STACK_SKIP_SIZE + PUSH r2 + PUSH r3 + /* Save the address of the instruction that caused the problem. */ + MOVE_FROM_SPR r2, SPR_EPCR_BASE + LOAD_IMMEDIATE r3, 0x15000000 /* Opcode for l.nop */ + l.sw -4(r2), r3 + POP r3 + POP r2 + l.addi r1, r1, EXCEPTION_STACK_SKIP_SIZE + l.rfe + + .section .data + .align 4 + .type pi, @object + .size pi, 8 +anchor: +pi: + .double 3.14159 + + .type e, @object + .size e, 8 +e: + .double 2.71828 + + .type large, @object + .size large, 8 +large: + .long 0 + .long 0x1234 + + .section .text +start_tests: + PUSH LINK_REGISTER_R9 + + /* Test lf.itof.d int to double conversion. Setting up: + * r11 pointer to data + * r12,r13 pi as double + * r14,r15 e as double + * r16,r17 a long long + */ + l.ori r11, r0, ha(anchor) + l.addi r11, r11, lo(anchor) + l.lwz r12, 0(r11) + l.lwz r13, 4(r11) + + l.lwz r14, 8(r11) + l.lwz r15, 12(r11) + + l.lwz r16, 16(r11) + l.lwz r18, 20(r11) + + /* Output to ensure we loaded it correctly. */ + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + + REPORT_REG_TO_CONSOLE r14 + REPORT_REG_TO_CONSOLE r15 + + REPORT_REG_TO_CONSOLE r16 + REPORT_REG_TO_CONSOLE r18 + PRINT_NEWLINE_TO_CONSOLE + + /* Convert the big long to a double. */ + lf.itof.d r16, r16 + REPORT_REG_TO_CONSOLE r16 + REPORT_REG_TO_CONSOLE r18 + + /* Convert the double back to a long, it should match before. */ + lf.ftoi.d r16, r16 + lf.itof.d r16, r16 + + REPORT_REG_TO_CONSOLE r16 + REPORT_REG_TO_CONSOLE r18 + + PRINT_NEWLINE_TO_CONSOLE + + /* Add and subtract some double values. */ + lf.add.d r12, r12, r14 + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + + lf.sub.d r12, r12, r14 + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + PRINT_NEWLINE_TO_CONSOLE + + /* Multiply and divide double values. */ + lf.mul.d r12, r12, r14 + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + + lf.div.d r12, r12, r14 + REPORT_REG_TO_CONSOLE r12 + REPORT_REG_TO_CONSOLE r13 + PRINT_NEWLINE_TO_CONSOLE + + /* Test lf.sfge.s set flag if r6 >= r10. */ + lf.sfge.d r12, r14 + MOVE_FROM_SPR r2, SPR_SR + REPORT_BIT_TO_CONSOLE r2, SPR_SR_F + PRINT_NEWLINE_TO_CONSOLE + + /* Test raising an exception by dividing by 0. */ + MOVE_FROM_SPR r2, SPR_FPCSR + l.ori r2, r2, 0x1 + MOVE_TO_SPR SPR_FPCSR, r2 +div0: lf.div.d r2, r12, r0 + REPORT_EXCEPTION div0 + PRINT_NEWLINE_TO_CONSOLE + + POP LINK_REGISTER_R9 + RETURN_TO_LINK_REGISTER_R9Signature · 1 line
2.19.1
PATCH v2 6/6 sim/common: Fix issue with wrong byte order on BE targets
In reply to Stafford HorneCurrently only the OpenRISC sim uses this JOINSIDF() function to compose a double float from 2 registers. The old code doesn't seem to work as the work order gets swapped when running on a x86_64 host. This change fixes that, but I am not sure if its the best thing to do.
On mips they do similar reg pair floating point operations composing doubles from 2 32-bit registers in sim/mips/cp1.c value_fpr().
sim/common/ChangeLog:
* cgen-ops.h (JOINSIDF): Fix big endian check.
--- sim/common/cgen-ops.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
sim/common/cgen-ops.h +2 -6
@@ -431,12 +431,8 @@ JOINSIDI (SI x0, SI x1) SEMOPS_INLINE DFJOINSIDF (SI x0,SI x1) { -union {SI in[2 ];DF out; } x; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG ) - x.in[0 ] = x0, x.in[1 ] = x1; -else - x.in[1 ] = x0, x.in[0 ] = x1; -return x.out; +/* Making doubles is the same as making long longs. */ +return MAKEDI (x0, x1); }SEMOPS_INLINE XF
Signature · 1 line
2.19.1
PATCH v2 6/6 sim/common: Fix issue with wrong byte order on BE targets
Quoted 20 lines · Stafford Horne
Currently only the OpenRISC sim uses this
JOINSIDF()function to compose a double float from 2 registers. The old code doesn't seem to work as the work order gets swapped when running on ax86_64host. This change fixes that, but I am not sure if its the best thing to do.On mips they do similar reg pair floating point operations composing doubles from 2 32-bit registers in
sim/mips/cp1.cvalue_fpr().sim/common/ChangeLog:
*
cgen-ops.h(JOINSIDF): Fix big endian check.--- sim/common/cgen-ops.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)sim/common/cgen-ops.h +0
-0
sim/common/cgen-ops.h JOINSIDI (SI x0, SI x1) · line 435
Quoted 5 lines
sim/common/cgen-ops.h +0
-2@@ -431,12 +431,8 @@ JOINSIDI (SI x0, SI x1) SEMOPS_INLINE DFJOINSIDF (SI x0,SI x1) { -union {SI in[2 ];DF out; } x; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG )
I think this is the problem with the existing code, we're using memory on the HOST to perform packing / unpacking, and so its the byte ordering of the HOST that we care about here, not the target.
If I change the above line to instead be:
if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG)
then everything works fine.
On inspection I believe all of the uses of CURRENT_TARGET_BYTE_ORDER in this file should be similarly replaced.
I've attached a patch for this change. If you agree I'll go ahead and push it.
Thanks,
Andrew
--
[PATCH] sim: Use host not target byte order for merging and splitting values
When using writes to memory through a struct to merge and extract multi-word value, it is the endianness of the host, not the target that affects which order the component words need to be written into the structure.
Of the 5 functions adjusted here 4 of them are unused. The 5th, JOINSIDF will soon be used by the or1k target.
For or1k, simulated on x86-64, this change fixes this function so that the correct bytes are now returned.
sim/common/ChangeLog:
* cgen-ops.h (SUBWORDXFSI): Compare HOST_BYTE_ORDER not CURRENT_TARGET_BYTE_ORDER.
(SUBWORDTFSI): Likewise.
(JOINSIDF): Likewise.
(JOINSIXF): Likewise.
(JOINSITF): Likewise.
--- sim/common/ChangeLog | 9 +++++++++ sim/common/cgen-ops.h | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
sim/common/cgen-ops.h +5 -5
@@ -404,7 +404,7 @@ SUBWORDXFSI (XF in, int word)/* Note: typedef struct { SI parts[3]; } XF; */ union {XF in;SI out[3 ]; } x; x.in = in; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG ) +if (HOST_BYTE_ORDER ==BFD_ENDIAN_BIG )return x.out[word];else return x.out[2 - word];
@@ -416,7 +416,7 @@ SUBWORDTFSI (TF in, int word)/* Note: typedef struct { SI parts[4]; } TF; */ union {TF in;SI out[4 ]; } x; x.in = in; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG ) +if (HOST_BYTE_ORDER ==BFD_ENDIAN_BIG )return x.out[word];else return x.out[3 - word];
@@ -432,7 +432,7 @@ SEMOPS_INLINE DF JOINSIDF (SI x0, SI x1) {union {SI in[2 ];DF out; } x; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG ) +if (HOST_BYTE_ORDER ==BFD_ENDIAN_BIG ) x.in[0 ] = x0, x.in[1 ] = x1;else x.in[1 ] = x0, x.in[0 ] = x1;
@@ -443,7 +443,7 @@ SEMOPS_INLINE XF JOINSIXF (SI x0, SI x1, SI x2) {union {SI in[3 ];XF out; } x; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG ) +if (HOST_BYTE_ORDER ==BFD_ENDIAN_BIG ) x.in[0 ] = x0, x.in[1 ] = x1, x.in[2 ] = x2;else x.in[2 ] = x0, x.in[1 ] = x1, x.in[0 ] = x2;
@@ -454,7 +454,7 @@ SEMOPS_INLINE TF JOINSITF (SI x0, SI x1, SI x2, SI x3) { union { SI in[4]; TF out; } x; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG ) +if (HOST_BYTE_ORDER ==BFD_ENDIAN_BIG ) x.in[0 ] = x0, x.in[1 ] = x1, x.in[2 ] = x2, x.in[3 ] = x3;else x.in[3 ] = x0, x.in[2 ] = x1, x.in[1 ] = x2, x.in[0 ] = x3;
Signature · 1 line
2.14.5
PATCH v2 6/6 sim/common: Fix issue with wrong byte order on BE targets
Hi Andrew,
Quoted 36 lines · Andrew Burgess
Quoted 20 lines · Stafford Horne
Currently only the OpenRISC sim uses this
JOINSIDF()function to compose a double float from 2 registers. The old code doesn't seem to work as the work order gets swapped when running on ax86_64host. This change fixes that, but I am not sure if its the best thing to do.On mips they do similar reg pair floating point operations composing doubles from 2 32-bit registers in
sim/mips/cp1.cvalue_fpr().sim/common/ChangeLog:
*
cgen-ops.h(JOINSIDF): Fix big endian check.--- sim/common/cgen-ops.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)sim/common/cgen-ops.h +0
-0sim/common/cgen-ops.h JOINSIDI (SI x0, SI x1) · line 435
Quoted 5 lines
sim/common/cgen-ops.h +0
-2@@ -431,12 +431,8 @@ JOINSIDI (SI x0, SI x1) SEMOPS_INLINE DFJOINSIDF (SI x0,SI x1) { -union {SI in[2 ];DF out; } x; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG )I think this is the problem with the existing code, we're using memory on the HOST to perform packing / unpacking, and so its the byte ordering of the HOST that we care about here, not the target.
If I change the above line to instead be:
if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG)
Quoted 7 lines
then everything works fine.
On inspection I believe all of the uses of
CURRENT_TARGET_BYTE_ORDERin this file should be similarly replaced.I've attached a patch for this change. If you agree I'll go ahead and push it.
I tested this with the or1k testsuite and it does seem to work fine, thank you. Please go ahead.
I thought I had tried this fix as well, I guess not.
-Stafford
PATCH v2 6/6 sim/common: Fix issue with wrong byte order on BE targets
Quoted 44 lines · Stafford Horne
Hi Andrew,
Quoted 41 lines · Andrew Burgess
Quoted 20 lines · Stafford Horne
Currently only the OpenRISC sim uses this
JOINSIDF()function to compose a double float from 2 registers. The old code doesn't seem to work as the work order gets swapped when running on ax86_64host. This change fixes that, but I am not sure if its the best thing to do.On mips they do similar reg pair floating point operations composing doubles from 2 32-bit registers in
sim/mips/cp1.cvalue_fpr().sim/common/ChangeLog:
*
cgen-ops.h(JOINSIDF): Fix big endian check.--- sim/common/cgen-ops.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)sim/common/cgen-ops.h +0
-0sim/common/cgen-ops.h JOINSIDI (SI x0, SI x1) · line 435
Quoted 5 lines
sim/common/cgen-ops.h +0
-2@@ -431,12 +431,8 @@ JOINSIDI (SI x0, SI x1) SEMOPS_INLINE DFJOINSIDF (SI x0,SI x1) { -union {SI in[2 ];DF out; } x; -if (CURRENT_TARGET_BYTE_ORDER ==BFD_ENDIAN_BIG )I think this is the problem with the existing code, we're using memory on the HOST to perform packing / unpacking, and so its the byte ordering of the HOST that we care about here, not the target.
If I change the above line to instead be:
if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG)then everything works fine.
On inspection I believe all of the uses of
CURRENT_TARGET_BYTE_ORDERin this file should be similarly replaced.
Quoted 7 lines
Quoted 2 lines
I've attached a patch for this change. If you agree I'll go ahead and push it.
I tested this with the or1k testsuite and it does seem to work fine, thank you. Please go ahead.
I thought I had tried this fix as well, I guess not.
Thanks for testing this.
I've pushed this patch now.
Andrew