From 6e58a97d7c35bc2d04d84ab8908561489aec5411 Mon Sep 17 00:00:00 2001
From: Peter Edwards <peadar@arista.com>
Date: Tue, 24 Dec 2024 19:38:50 +0000
Subject: [PATCH] add some previously-unimplemented DW_OP_'s

---
 dwarfproc.cc          | 62 +++++++++++++++++++++++++++++++++++++++++++
 libpstack/dwarf/ops.h |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/dwarfproc.cc b/dwarfproc.cc
index 845c768..4237f94 100644
--- a/dwarfproc.cc
+++ b/dwarfproc.cc
@@ -255,6 +255,13 @@ ExpressionStack::eval(Process &proc, Dwarf::DWARFReader &r, const StackFrame *fr
                 break;
             }
 
+            case DW_OP_plus_uconst: {
+                auto arg = r.getuleb128();
+                auto tos = poptop();
+                push(arg + tos);
+                break;
+            }
+
             case DW_OP_breg0: case DW_OP_breg1: case DW_OP_breg2: case DW_OP_breg3:
             case DW_OP_breg4: case DW_OP_breg5: case DW_OP_breg6: case DW_OP_breg7:
             case DW_OP_breg8: case DW_OP_breg9: case DW_OP_breg10: case DW_OP_breg11:
@@ -278,6 +285,24 @@ ExpressionStack::eval(Process &proc, Dwarf::DWARFReader &r, const StackFrame *fr
                 push(op - DW_OP_lit0);
                 break;
 
+            case DW_OP_not: {
+                auto arg = poptop();
+                push(~arg);
+                break;
+            }
+
+            case DW_OP_abs: {
+                auto arg = intmax_t(poptop());
+                push(std::abs(arg));
+                break;
+            }
+
+            case DW_OP_neg: {
+                auto arg = intmax_t(poptop());
+                push(-arg);
+                break;
+            }
+
             case DW_OP_and: {
                 auto lhs = poptop();
                 auto rhs = poptop();
@@ -285,6 +310,28 @@ ExpressionStack::eval(Process &proc, Dwarf::DWARFReader &r, const StackFrame *fr
                 break;
             }
 
+            case DW_OP_div: {
+                auto denom = intmax_t(poptop());
+                auto num = intmax_t(poptop());
+                push(num/denom);
+                break;
+            }
+
+            case DW_OP_mul: {
+                auto a = intmax_t(poptop());
+                auto b = intmax_t(poptop());
+                push(a*b);
+                break;
+            }
+
+
+            case DW_OP_mod: {
+                auto denom = intmax_t(poptop());
+                auto num = intmax_t(poptop());
+                push(num%denom);
+                break;
+            }
+
             case DW_OP_or: {
                 auto lhs = poptop();
                 auto rhs = poptop();
@@ -292,6 +339,13 @@ ExpressionStack::eval(Process &proc, Dwarf::DWARFReader &r, const StackFrame *fr
                 break;
             }
 
+            case DW_OP_xor: {
+                auto lhs = poptop();
+                auto rhs = poptop();
+                push(lhs ^ rhs);
+                break;
+            }
+
             case DW_OP_le: {
                 auto rhs = poptop();
                 auto lhs = poptop();
@@ -347,6 +401,14 @@ ExpressionStack::eval(Process &proc, Dwarf::DWARFReader &r, const StackFrame *fr
                 push(lhs >> rhs);
                 break;
             }
+
+            case DW_OP_shra: {
+                auto rhs = intmax_t(poptop());
+                auto lhs = intmax_t(poptop());
+                push(lhs >> rhs);
+                break;
+            }
+
             case DW_OP_addr: {
                 auto value = r.getuint(r.addrLen);
                 push(value + reloc);
diff --git a/libpstack/dwarf/ops.h b/libpstack/dwarf/ops.h
index b0c71fd..2156b38 100644
--- a/libpstack/dwarf/ops.h
+++ b/libpstack/dwarf/ops.h
@@ -19,7 +19,7 @@ DWARF_OP(DW_OP_rot, 0x17, 0)
 DWARF_OP(DW_OP_xderef, 0x18, 0)
 DWARF_OP(DW_OP_abs, 0x19, 0)
 DWARF_OP(DW_OP_and, 0x1a, 0)
-DWARF_OP(DW_OP_div0, 0x1b, 0)
+DWARF_OP(DW_OP_div, 0x1b, 0)
 DWARF_OP(DW_OP_minus, 0x1c, 0)
 DWARF_OP(DW_OP_mod, 0x1d, 0)
 DWARF_OP(DW_OP_mul, 0x1e, 0)