espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-07-01 01:45:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

sim: bpf: fix mixed decls & code warnings (and style)

Browse Source
This commit is contained in:
Mike Frysinger
2021-06-26 22:03:14 -04:00
parent 5d0b3088f7
commit cc9c19b030
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sim/bpf/ChangeLog
View File

@ -1,3 +1,8 @@
2021-06-27 Mike Frysinger <vapier@gentoo.org>
* bpf-helpers.c (bpf_trace_printk): Move value decl to top of scope.
* mloop.in: Move off16 & imm32 decls to top of scope.
2021-06-22 Mike Frysinger <vapier@gentoo.org> 2021-06-22 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate. * configure: Regenerate.

3
sim/bpf/bpf-helpers.c
View File

@ -72,6 +72,7 @@ bpf_trace_printk (SIM_CPU *current_cpu)
supported, which are read from %r3, %r4 and %r5 respectively. */ supported, which are read from %r3, %r4 and %r5 respectively. */
for (i = 0, tags_processed = 0; i < size;) for (i = 0, tags_processed = 0; i < size;)
{ {
UDI value;
QI c = GETMEMUQI (current_cpu, CPU_PC_GET (current_cpu), QI c = GETMEMUQI (current_cpu, CPU_PC_GET (current_cpu),
fmt_address + i); fmt_address + i);
@ -88,7 +89,7 @@ bpf_trace_printk (SIM_CPU *current_cpu)
if (i++ >= size) if (i++ >= size)
return -1; /* XXX look for kernel error code. */ return -1; /* XXX look for kernel error code. */
UDI value = GET_H_GPR (3 + tags_processed); value = GET_H_GPR (3 + tags_processed);
switch ((GETMEMUQI (current_cpu, CPU_PC_GET (current_cpu), switch ((GETMEMUQI (current_cpu, CPU_PC_GET (current_cpu),
fmt_address + i))) fmt_address + i)))

7
sim/bpf/mloop.in
View File

@ -123,14 +123,17 @@ cat <<EOF
if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
{ {
UHI off16;
USI imm32;
/* eBPF instructions are little-endian, but GETIMEMUDI reads according /* eBPF instructions are little-endian, but GETIMEMUDI reads according
to target byte order. Swap to little-endian. */ to target byte order. Swap to little-endian. */
insn = SWAP_8 (insn); insn = SWAP_8 (insn);
/* But, the imm32 and offset16 fields within instructions follow target /* But, the imm32 and offset16 fields within instructions follow target
byte order. Swap those fields back. */ byte order. Swap those fields back. */
UHI off16 = (UHI) ((insn & 0x00000000ffff0000) >> 16); off16 = (UHI) ((insn & 0x00000000ffff0000) >> 16);
USI imm32 = (USI) ((insn & 0xffffffff00000000) >> 32); imm32 = (USI) ((insn & 0xffffffff00000000) >> 32);
off16 = SWAP_2 (off16); off16 = SWAP_2 (off16);
imm32 = SWAP_4 (imm32); imm32 = SWAP_4 (imm32);