Fix line number off-by-one errors

GJDuck · Jun 26, 2024 · 03375cf · 03375cf
1 parent 2137b6d
commit 03375cf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/src/e9tool/e9dwarf.cpp b/src/e9tool/e9dwarf.cpp
@@ -243,6 +243,15 @@ extern const Line *e9tool::findLine(const Lines &Ls, intptr_t addr)
     auto i = Ls.lower_bound(addr);
     if (i == Ls.end())
         return nullptr;
-    return &i->second;
+    if (i->second.lb == addr)
+        return &i->second;
+    auto j = Ls.begin();
+    if (i == j)
+        return nullptr;
+    i--;
+    if (i->second.lb <= addr && addr < i->second.ub)
+        return &i->second;
+    else
+        return nullptr;
 }
 
diff --git a/src/e9tool/e9metadata.cpp b/src/e9tool/e9metadata.cpp
@@ -1957,12 +1957,12 @@ static Type sendLoadArgumentMetadata(FILE *out, CallInfo &info,
         case ARGUMENT_FILENAME: case ARGUMENT_ABSNAME:
         case ARGUMENT_BASENAME: case ARGUMENT_DIRNAME:
         {
-            auto i = elf->lines.lower_bound(I->address);
-            if (i != elf->lines.end())
+            const Line *line = findLine(elf->lines, I->address);
+            if (line != nullptr)
             {
-                const auto &line = i->second;
                 if (arg.kind == ARGUMENT_DIRNAME &&
-                    (line.dir == nullptr && strchr(line.file, '/') == nullptr))
+                    (line->dir == nullptr &&
+                        strchr(line->file, '/') == nullptr))
                 {
                     sendSExtFromI32ToR64(out, 0, regno);
                     t = TYPE_NULL_PTR;
@@ -1991,21 +1991,20 @@ static Type sendLoadArgumentMetadata(FILE *out, CallInfo &info,
         }
         case ARGUMENT_LINE:
         {
-            auto i = elf->lines.lower_bound(I->address);
-            if (i == elf->lines.end())
+            const Line *line = findLine(elf->lines, I->address);
+            if (line == nullptr)
             {
                 sendSExtFromI32ToR64(out, 0, regno);
                 t = TYPE_CONST_VOID_PTR;
                 break;
             }
-            const Line &line = i->second;
             switch (arg.field)
             {
                 case FIELD_NONE:
-                    sendLoadValueMetadata(out, line.line, regno);
+                    sendLoadValueMetadata(out, line->line, regno);
                     break;
                 case FIELD_SIZE:
-                    sendLoadValueMetadata(out, line.ub - line.lb, regno);
+                    sendLoadValueMetadata(out, line->ub - line->lb, regno);
                     break;
                 default:
                     error("unknown field (%d)", arg.field);
@@ -2091,21 +2090,20 @@ static void sendArgumentDataMetadata(FILE *out, const char *name,
         case ARGUMENT_FILENAME: case ARGUMENT_ABSNAME:
         case ARGUMENT_BASENAME: case ARGUMENT_DIRNAME:
         {
-            auto i = elf->lines.lower_bound(I->address);
-            if (i == elf->lines.end())
+            const Line *line = findLine(elf->lines, I->address);
+            if (line == nullptr)
                 return;
-            const auto &line = i->second;
             std::string tmp;
-            const char *file = line.file, *kind = "file";
+            const char *file = line->file, *kind = "file";
             switch (arg.kind)
             {
                 case ARGUMENT_ABSNAME:
-                    getAbsname(line.dir, line.file, tmp);
+                    getAbsname(line->dir, line->file, tmp);
                     kind = "abs"; file = tmp.c_str(); break;
                 case ARGUMENT_BASENAME:
-                    kind = "base"; file = getBasename(line.file); break;
+                    kind = "base"; file = getBasename(line->file); break;
                 case ARGUMENT_DIRNAME:
-                    getDirname(line.dir, line.file, tmp);
+                    getDirname(line->dir, line->file, tmp);
                     kind = "dir"; file = tmp.c_str(); break;
                 default:
                     break;