[ext] Upgrade orbuculum with loadelf fixes

Auterion · Jan 22, 2024 · a708a3e · a708a3e
1 parent 667167a
commit a708a3e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml
@@ -4,9 +4,9 @@ on: [push, pull_request]
 
 jobs:
   osx:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
-      - run: brew install zmq sdl2 libelf protobuf meson ninja
+      - run: brew install zmq sdl2 libelf protobuf meson ninja capstone dwarfutils
       - uses: actions/checkout@v3
       - run: meson setup ./build
         working-directory: ext/orbetto

diff --git a/ext/orbetto/README.md b/ext/orbetto/README.md
@@ -46,7 +46,7 @@ Please install the following dependencies:
 sudo apt-get install -y libusb-1.0-0-dev libzmq3-dev meson libsdl2-dev libdwarf-dev libdw-dev libelf-dev libcapstone-dev python3-pip ninja-build protobuf-compiler
 sudo pip3 install meson==1.2.0
 # macOS
-brew install zmq sdl2 libelf protobuf meson ninja
+brew install libusb zmq sdl2 libelf dwarfutils protobuf meson ninja capstone
 ```
 
 Then build the `build/orbetto` binary:

diff --git a/ext/orbetto/loadelf.c b/ext/orbetto/loadelf.c
diff --git a/ext/orbetto/meson.build b/ext/orbetto/meson.build
@@ -22,7 +22,7 @@ git_version_info_h = orbuculum.get_variable('git_version_info_h')
 
 # Compile and link everything together
 executable('orbetto',
-    sources: ['orbetto.cpp', 'loadelf.c', git_version_info_h],
+    sources: ['orbetto.cpp', git_version_info_h],
     include_directories: ['subprojects/orbuculum/Inc', 'subprojects/orbuculum/Inc/external'] + perfbuf_lib.private_dir_include(),
     dependencies: [dependency('protobuf')] + orbuculum.get_variable('dependencies'),
     link_with: [liborb, perfbuf_lib],

diff --git a/ext/orbetto/orbetto.cpp b/ext/orbetto/orbetto.cpp
@@ -1692,8 +1692,8 @@ int main( int argc, char *argv[] )
 
     if ( options.elfFile )
     {
-        /* Only load memory for now */
-        _r.symbols = symbolAcquire(options.elfFile, false, true, false);
+        printf("Loading ELF file %s\n", options.elfFile);
+        _r.symbols = symbolAcquire(options.elfFile, true, true);
         assert( _r.symbols );
         printf("Loaded ELF file %s with %u sections\n", options.elfFile, _r.symbols->nsect_mem);
         for (int ii = 0; ii < _r.symbols->nsect_mem; ii++)

diff --git a/ext/orbetto/subprojects/orbuculum.wrap b/ext/orbetto/subprojects/orbuculum.wrap
@@ -1,3 +1,3 @@
 [wrap-git]
 url = https://github.com/niklaut/orbuculum.git
-revision = adee960
+revision = 7a8f4c0