fix: regression location integer overflow (#215)

xensik · Jul 14, 2024 · 4fcedf3 · 4fcedf3
1 parent 9ebbc0f
commit 4fcedf3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/include/xsk/arc/common/assembly.hpp b/include/xsk/arc/common/assembly.hpp
@@ -160,8 +160,8 @@ enum class opcode : u8
 
 struct sourcepos
 {
-    u16 line;
-    u16 column;
+    i32 line;
+    i32 column;
 };
 
 struct instruction

diff --git a/include/xsk/arc/common/location.hpp b/include/xsk/arc/common/location.hpp
@@ -12,7 +12,7 @@ class position
 {
 public:
     typedef const std::string filename_type;
-    typedef u16 counter_type;
+    typedef i32 counter_type;
 
     filename_type *filename;
     counter_type line;

diff --git a/include/xsk/gsc/common/assembly.hpp b/include/xsk/gsc/common/assembly.hpp
@@ -222,8 +222,8 @@ enum class opcode : u8
 
 struct sourcepos
 {
-    u16 line;
-    u16 column;
+    i32 line;
+    i32 column;
 };
 
 struct instruction

diff --git a/include/xsk/gsc/common/location.hpp b/include/xsk/gsc/common/location.hpp
@@ -12,7 +12,7 @@ class position
 {
 public:
     typedef const std::string filename_type;
-    typedef u16 counter_type;
+    typedef i32 counter_type;
 
     filename_type *filename;
     counter_type line;

diff --git a/src/arc/assembler.cpp b/src/arc/assembler.cpp
@@ -283,8 +283,8 @@ auto assembler::assemble_instruction(instruction const& inst) -> void
     if ((ctx_->build() & build::dev_maps) != build::prod)
     {
         devmap_.write<u32>(script_.pos());
-        devmap_.write<u16>(inst.pos.line);
-        devmap_.write<u16>(inst.pos.column);
+        devmap_.write<u16>(static_cast<u16>(inst.pos.line));
+        devmap_.write<u16>(static_cast<u16>(inst.pos.column));
         devmap_count_++;
     }
 

diff --git a/src/gsc/assembler.cpp b/src/gsc/assembler.cpp
@@ -74,8 +74,8 @@ auto assembler::assemble_instruction(instruction const& inst) -> void
     if ((ctx_->build() & build::dev_maps) != build::prod)
     {
         devmap_.write<u32>(script_.pos());
-        devmap_.write<u16>(inst.pos.line);
-        devmap_.write<u16>(inst.pos.column);
+        devmap_.write<u16>(static_cast<u16>(inst.pos.line));
+        devmap_.write<u16>(static_cast<u16>(inst.pos.column));
         devmap_count_++;
     }