From 3ad6c19423eedf84dfd5ea83bc03933dff8a4579 Mon Sep 17 00:00:00 2001 From: David Faust Date: Tue, 8 Sep 2020 11:39:07 -0700 Subject: bpf: simulator: correct div, mod insn semantics The div and mod eBPF instructions are unsigned, but the semantic specification for the simulator incorrectly used signed operators. Correct them to unsigned versions, and correct the ALU tests in the simulator (which incorrectly assumed signed semantics). Tested in bpf-unknown-none. cpu/ChangeLog: 2020-09-08 David Faust * bpf.cpu (define-alu-instructions): Correct semantic operators for div, mod to unsigned versions. sim/ChangeLog: 2020-09-08 David Faust * bpf/sem-be.c: Regenerate. * bpf/sem-le.c: Likewise. sim/testsuite/ChangeLog: 2020-09-08 David Faust * sim/bpf/alu.s: Correct div and mod tests. * sim/bpf/alu32.s: Likewise. --- sim/bpf/sem-le.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sim/bpf/sem-le.c') diff --git a/sim/bpf/sem-le.c b/sim/bpf/sem-le.c index 8bb1deb..58a59b1 100644 --- a/sim/bpf/sem-le.c +++ b/sim/bpf/sem-le.c @@ -461,7 +461,7 @@ SEM_FN_NAME (bpfbf_ebpfle,divile) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 8); { - DI opval = DIVDI (CPU (h_gpr[FLD (f_dstle)]), FLD (f_imm32)); + DI opval = UDIVDI (CPU (h_gpr[FLD (f_dstle)]), FLD (f_imm32)); CPU (h_gpr[FLD (f_dstle)]) = opval; CGEN_TRACE_RESULT (current_cpu, abuf, "gpr", 'D', opval); } @@ -482,7 +482,7 @@ SEM_FN_NAME (bpfbf_ebpfle,divrle) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 8); { - DI opval = DIVDI (CPU (h_gpr[FLD (f_dstle)]), CPU (h_gpr[FLD (f_srcle)])); + DI opval = UDIVDI (CPU (h_gpr[FLD (f_dstle)]), CPU (h_gpr[FLD (f_srcle)])); CPU (h_gpr[FLD (f_dstle)]) = opval; CGEN_TRACE_RESULT (current_cpu, abuf, "gpr", 'D', opval); } @@ -503,7 +503,7 @@ SEM_FN_NAME (bpfbf_ebpfle,div32ile) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 8); { - USI opval = DIVSI (CPU (h_gpr[FLD (f_dstle)]), FLD (f_imm32)); + USI opval = UDIVSI (CPU (h_gpr[FLD (f_dstle)]), FLD (f_imm32)); CPU (h_gpr[FLD (f_dstle)]) = opval; CGEN_TRACE_RESULT (current_cpu, abuf, "gpr", 'x', opval); } @@ -524,7 +524,7 @@ SEM_FN_NAME (bpfbf_ebpfle,div32rle) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 8); { - USI opval = DIVSI (CPU (h_gpr[FLD (f_dstle)]), CPU (h_gpr[FLD (f_srcle)])); + USI opval = UDIVSI (CPU (h_gpr[FLD (f_dstle)]), CPU (h_gpr[FLD (f_srcle)])); CPU (h_gpr[FLD (f_dstle)]) = opval; CGEN_TRACE_RESULT (current_cpu, abuf, "gpr", 'x', opval); } @@ -881,7 +881,7 @@ SEM_FN_NAME (bpfbf_ebpfle,modile) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 8); { - DI opval = MODDI (CPU (h_gpr[FLD (f_dstle)]), FLD (f_imm32)); + DI opval = UMODDI (CPU (h_gpr[FLD (f_dstle)]), FLD (f_imm32)); CPU (h_gpr[FLD (f_dstle)]) = opval; CGEN_TRACE_RESULT (current_cpu, abuf, "gpr", 'D', opval); } @@ -902,7 +902,7 @@ SEM_FN_NAME (bpfbf_ebpfle,modrle) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 8); { - DI opval = MODDI (CPU (h_gpr[FLD (f_dstle)]), CPU (h_gpr[FLD (f_srcle)])); + DI opval = UMODDI (CPU (h_gpr[FLD (f_dstle)]), CPU (h_gpr[FLD (f_srcle)])); CPU (h_gpr[FLD (f_dstle)]) = opval; CGEN_TRACE_RESULT (current_cpu, abuf, "gpr", 'D', opval); } @@ -923,7 +923,7 @@ SEM_FN_NAME (bpfbf_ebpfle,mod32ile) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 8); { - USI opval = MODSI (CPU (h_gpr[FLD (f_dstle)]), FLD (f_imm32)); + USI opval = UMODSI (CPU (h_gpr[FLD (f_dstle)]), FLD (f_imm32)); CPU (h_gpr[FLD (f_dstle)]) = opval; CGEN_TRACE_RESULT (current_cpu, abuf, "gpr", 'x', opval); } @@ -944,7 +944,7 @@ SEM_FN_NAME (bpfbf_ebpfle,mod32rle) (SIM_CPU *current_cpu, SEM_ARG sem_arg) SEM_PC vpc = SEM_NEXT_VPC (sem_arg, pc, 8); { - USI opval = MODSI (CPU (h_gpr[FLD (f_dstle)]), CPU (h_gpr[FLD (f_srcle)])); + USI opval = UMODSI (CPU (h_gpr[FLD (f_dstle)]), CPU (h_gpr[FLD (f_srcle)])); CPU (h_gpr[FLD (f_dstle)]) = opval; CGEN_TRACE_RESULT (current_cpu, abuf, "gpr", 'x', opval); } -- cgit v1.1