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>
---
 nexus/arch.h | 40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

(limited to 'nexus/arch.h')

diff --git a/nexus/arch.h b/nexus/arch.h
index 00934797..e9984ee6 100644
--- a/nexus/arch.h
+++ b/nexus/arch.h
@@ -28,45 +28,7 @@
 
 NEXTPNR_NAMESPACE_BEGIN
 
-template <typename T> struct RelPtr
-{
-    int32_t offset;
-
-    // void set(const T *ptr) {
-    //     offset = reinterpret_cast<const char*>(ptr) -
-    //              reinterpret_cast<const char*>(this);
-    // }
-
-    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(); }
-};
-
-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(); }
-});
+#include "relptr.h"
 
 /*
     Fully deduplicated database
-- 
cgit v1.2.3