Moved the (U)LEB128 handling functions into their own file

Author: mhahnFr

src/parser/file/dwarf/dwarf_parser.c

@@ -20,48 +20,12 @@
  */
 
 #include "dwarf_parser.h"
+#include "leb128.h"
 #include "vector_pair_uint64.h"
 
 #include "v4/definitions.h"
 #include "v5/definitions.h"
 
-uint64_t getULEB128(void* begin, size_t* counter) {
-    uint64_t result = 0,
-             shift  = 0;
-    
-    bool more = true;
-    do {
-        uint8_t b = *((uint8_t*) (begin + *counter));
-        *counter += 1;
-        result |= (b & 0x7f) << shift;
-        shift += 7;
-        if (b < 0x80) {
-            more = false;
-        }
-    } while (more);
-    return result;
-}
-
-int64_t getLEB128(void* begin, size_t* counter) {
-    int64_t result = 0,
-            shift  = 0;
-    
-    bool more = true;
-    do {
-        uint8_t b = *((uint8_t*) (begin + *counter));
-        *counter += 1;
-        result |= (b & 0x7f) << shift;
-        shift += 7;
-        if ((0x80 & b) == 0) {
-            if (shift < 32 && (b & 0x40) != 0) {
-                result |= ((uint64_t) ~0 << shift);
-            }
-            more = false;
-        }
-    } while (more);
-    return result;
-}
-
 char* dwarf_pathConcatenate(const char* string1, const char* string2) {
     const size_t len1 = strlen(string1),
                  len2 = strlen(string2);

src/parser/file/dwarf/dwarf_parser.h

@@ -126,28 +126,6 @@ bool dwarf_parseLineProgram(struct lcs_section debugLine,
                             struct lcs_section debugStrOffsets,
                             dwarf_line_callback cb, void* args);
 
-/**
- * @brief Reads an unsigned LEB128 integer from the given memory at the given position.
- *
- * The given memory position points to the first byte after the read number once this function returns.
- *
- * @param begin the memory pointer
- * @param counter the memory position
- * @return the deducted number
- */
-uint64_t getULEB128(void* begin, size_t* counter);
-
-/**
- * @brief Reads a signed LEB128 integer from the given memory at the given position.
- *
- * The given memory position points to the first byte after the read number once this function returns.
- *
- * @param begin the memory pointer
- * @param counter the memory position
- * @return the deducted number
- */
-int64_t getLEB128(void* begin, size_t* counter);
-
 /**
  * Concatenates the two given strings as paths.
  *

src/parser/file/dwarf/leb128.c

@@ -0,0 +1,61 @@
+/*
+ * CallstackLibrary - Library creating human-readable call stacks.
+ *
+ * Copyright (C) 2024  mhahnFr
+ *
+ * This file is part of the CallstackLibrary.
+ *
+ * The CallstackLibrary is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The CallstackLibrary is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with the
+ * CallstackLibrary, see the file LICENSE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <stdbool.h>
+
+#include "leb128.h"
+
+uint64_t getULEB128(void* begin, size_t* counter) {
+    uint64_t result = 0,
+             shift  = 0;
+
+    bool more = true;
+    do {
+        uint8_t b = *((uint8_t*) (begin + *counter));
+        *counter += 1;
+        result |= (b & 0x7f) << shift;
+        shift += 7;
+        if (b < 0x80) {
+            more = false;
+        }
+    } while (more);
+    return result;
+}
+
+int64_t getLEB128(void* begin, size_t* counter) {
+    int64_t result = 0,
+            shift  = 0;
+
+    bool more = true;
+    do {
+        uint8_t b = *((uint8_t*) (begin + *counter));
+        *counter += 1;
+        result |= (b & 0x7f) << shift;
+        shift += 7;
+        if ((0x80 & b) == 0) {
+            if (shift < 32 && (b & 0x40) != 0) {
+                result |= ((uint64_t) ~0 << shift);
+            }
+            more = false;
+        }
+    } while (more);
+    return result;
+}

src/parser/file/dwarf/leb128.h

@@ -0,0 +1,52 @@
+/*
+ * CallstackLibrary - Library creating human-readable call stacks.
+ *
+ * Copyright (C) 2024  mhahnFr
+ *
+ * This file is part of the CallstackLibrary.
+ *
+ * The CallstackLibrary is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The CallstackLibrary is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with the
+ * CallstackLibrary, see the file LICENSE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef leb128_h
+#define leb128_h
+
+#include <stddef.h>
+#include <stdint.h>
+
+/**
+ * @brief Reads an unsigned LEB128 integer from the given memory at the given position.
+ *
+ * The given memory position points to the first byte after the read number once this function returns.
+ *
+ * @param begin the memory pointer
+ * @param counter the memory position
+ * @return the deducted number
+ */
+uint64_t getULEB128(void* begin, size_t* counter);
+
+/**
+ * @brief Reads a signed LEB128 integer from the given memory at the given position.
+ *
+ * The given memory position points to the first byte after the read number once this function returns.
+ *
+ * @param begin the memory pointer
+ * @param counter the memory position
+ * @return the deducted number
+ */
+int64_t getLEB128(void* begin, size_t* counter);
+
+
+
+#endif /* leb128_h */

src/parser/file/dwarf/v4/parser.c

@@ -22,6 +22,7 @@
 #include "parser.h"
 
 #include "../dwarf_parser.h"
+#include "../leb128.h"
 
 /**
  * Parses the line number program header in version 2, 3 or 4.

src/parser/file/dwarf/v5/parser.c

@@ -24,6 +24,7 @@
 #include "parser.h"
 
 #include "../dwarf_parser.h"
+#include "../leb128.h"
 #include "../optional_uint64_t.h"
 #include "../vector_pair_uint64.h"