From 85c4ddf562ee8d03146a6bcd99927f146579c3b3 Mon Sep 17 00:00:00 2001
From: Martin Teichmann <martin.teichmann@gmail.com>
Date: Sun, 12 Feb 2023 10:48:40 +0000
Subject: [PATCH] ebpf can actually only do floor div
as Python makes a difference here, follow its logic and call
floor division as such.
---
ebpfcat/ebpf.py | 4 ++--
ebpfcat/ebpf_test.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ebpfcat/ebpf.py b/ebpfcat/ebpf.py
index 7e5457d..84b6d41 100644
--- a/ebpfcat/ebpf.py
+++ b/ebpfcat/ebpf.py
@@ -439,8 +439,8 @@ class Expression:
__sub__ = binary(Opcode.SUB)
__rsub__ = rbinary(Opcode.SUB)
__rmul__ = __mul__ = binary(Opcode.MUL)
- __truediv__ = binary(Opcode.DIV)
- __rtruediv__ = rbinary(Opcode.DIV)
+ __floordiv__ = binary(Opcode.DIV)
+ __rfloordiv__ = rbinary(Opcode.DIV)
__ror__ = __or__ = binary(Opcode.OR)
__lshift__ = binary(Opcode.LSH)
__rlshift__ = rbinary(Opcode.LSH)
diff --git a/ebpfcat/ebpf_test.py b/ebpfcat/ebpf_test.py
index 953eff8..f7815f2 100644
--- a/ebpfcat/ebpf_test.py
+++ b/ebpfcat/ebpf_test.py
@@ -85,8 +85,8 @@ class Tests(TestCase):
e.r4 -= e.r7
e.r4 *= 3
e.r4 *= e.r7
- e.r4 /= 3
- e.r4 /= e.r7
+ e.r4 //= 3
+ e.r4 //= e.r7
e.r4 |= 3
e.r4 |= e.r7
e.r4 &= 3
@@ -555,7 +555,7 @@ class Tests(TestCase):
def test_reverse_binary(self):
e = EBPF()
e.owners = {0, 1, 2, 3}
- e.r3 = 7 / (e.r2 + 2)
+ e.r3 = 7 // (e.r2 + 2)
e.r3 = 7 << e.r2
e.r3 = 7 % (e.r2 + 3)
e.r3 = 7 >> e.r2
--
GitLab