From 75ee2fc4e6ede1ad731b9451fd606c61f5892801 Mon Sep 17 00:00:00 2001
From: "D. Shah" <dave@ds0.me>
Date: Wed, 27 Jan 2021 20:43:01 +0000
Subject: Move RelPtr/RelSlice out of arches into common

The bba approach seems widely used enough that it's reasonable for this
to become part of common code.

Signed-off-by: D. Shah <dave@ds0.me>
---
 common/relptr.h | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 common/relptr.h

(limited to 'common')

diff --git a/common/relptr.h b/common/relptr.h
new file mode 100644
index 00000000..f8f1d429
--- /dev/null
+++ b/common/relptr.h
@@ -0,0 +1,39 @@
+// This is intended to be included inside arch.h only.
+
+template <typename T> struct RelPtr
+{
+    int32_t offset;
+
+    const T *get() const { return reinterpret_cast<const T *>(reinterpret_cast<const char *>(this) + offset); }
+
+    const T &operator[](size_t index) const { return get()[index]; }
+
+    const T &operator*() const { return *(get()); }
+
+    const T *operator->() const { return get(); }
+
+    RelPtr(const RelPtr &) = delete;
+    RelPtr &operator=(const RelPtr &) = delete;
+};
+
+NPNR_PACKED_STRUCT(template <typename T> struct RelSlice {
+    int32_t offset;
+    uint32_t length;
+
+    const T *get() const { return reinterpret_cast<const T *>(reinterpret_cast<const char *>(this) + offset); }
+
+    const T &operator[](size_t index) const
+    {
+        NPNR_ASSERT(index < length);
+        return get()[index];
+    }
+
+    const T *begin() const { return get(); }
+    const T *end() const { return get() + length; }
+
+    const size_t size() const { return length; }
+
+    const T &operator*() const { return *(get()); }
+
+    const T *operator->() const { return get(); }
+});
-- 
cgit v1.2.3


From b87ab0ee9de093b5302de7997e94e10dae6655b4 Mon Sep 17 00:00:00 2001
From: "D. Shah" <dave@ds0.me>
Date: Wed, 27 Jan 2021 20:47:02 +0000
Subject: Make RelSlice uncopyable

Signed-off-by: D. Shah <dave@ds0.me>
---
 common/relptr.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'common')

diff --git a/common/relptr.h b/common/relptr.h
index f8f1d429..035d61fb 100644
--- a/common/relptr.h
+++ b/common/relptr.h
@@ -36,4 +36,7 @@ NPNR_PACKED_STRUCT(template <typename T> struct RelSlice {
     const T &operator*() const { return *(get()); }
 
     const T *operator->() const { return get(); }
+
+    RelSlice(const RelSlice &) = delete;
+    RelSlice &operator=(const RelSlice &) = delete;
 });
-- 
cgit v1.2.3