Runtime: Обработка данных в памяти сведена к единому интерфейсу.

runtime/datainterface.h

@@ -1,20 +1,59 @@
 #ifndef DATAINTERFACE_H
 #define DATAINTERFACE_H
 
+#include <cstring>
+
+template<int data_size>
 class DataInterface
 {
 public:
-    virtual bool read_bit(int offset, int bit_idx) = 0;
+    bool read_bit(int offset, int bit_idx)
+        { return (m_data[offset] & (1 << bit_idx)); }
+    void write_bit(int offset, int bit_idx, bool val)
+        {
+            if (val)
+                m_data[offset] |= (1 << bit_idx);
+            else
+                m_data[offset] &= ~(1 << bit_idx);
+        }
+
+    uint8_t read_ubyte(int offset)
+        { return m_data[offset]; }
+    void write_ubyte(int offset, uint8_t val)
+        { m_data[offset] = val; }
+
+    int8_t read_byte(int offset)
+        { return m_data[offset]; }
+    void write_byte(int offset, int8_t val)
+        { m_data[offset] = val; }
+
+    uint16_t read_word(int offset)
+        { return *((uint16_t*)&m_data[offset]); }
+    void write_word(int offset, uint16_t val)
+        { *((uint16_t*)&m_data[offset]) = val; }
+
+    int16_t read_int(int offset)
+        { return *((int16_t*)&m_data[offset]); }
+    void write_int(int offset, int16_t val)
+        { *((int16_t*)&m_data[offset]) = val; }
 
-    virtual uint8_t read_ubyte(int offset) = 0;
-    virtual int8_t read_byte(int offset) = 0;
+    uint32_t read_dword(int offset)
+        { return *((uint32_t*)&m_data[offset]); }
+    void write_dword(int offset, uint32_t val)
+        { *((uint32_t*)&m_data[offset]) = val; }
 
-    virtual uint16_t read_word(int offset) = 0;
-    virtual int16_t read_int(int offset) = 0;
+    float read_real(int offset)
+        { return *((float*)&m_data[offset]); }
+    void write_real(int offset, float val)
+        { *((float*)&m_data[offset]) = val; }
 
-    virtual uint32_t read_dword(int offset) = 0;
 
-    virtual float read_real(int offset) = 0;
+    void update_inputs(uint8_t* PIP)
+        { std::memcpy(this->m_data, PIP, IO_AREA_SIZE); }
+    void update_outputs(uint8_t* POP)
+        { std::memcpy(POP, this->m_data, IO_AREA_SIZE); }
+protected:
+    char    m_data[data_size];
 };
 
 #endif // DATAINTERFACE_H

runtime/firmware_sample/firmware.cpp

@@ -1,8 +1,8 @@
 #include "firmware.h"
 #include "fwdb.h"
-#include "io.h"
 #include <iostream>
 #include "plcstate.h"
+#include "plcdata.h"
 
 #define proc_none() (true)
 

runtime/plcbus.cpp

@@ -1,5 +1,4 @@
 #include "plcbus.h"
-#include "io.h"
 #include <fcntl.h>
 #include <termios.h>
 #include <unistd.h>
@@ -10,6 +9,7 @@
 #include <fstream>
 #include "plcstate.h"
 #include <arpa/inet.h>
+#include <plcdata.h>
 
 #ifdef FPGA_ALLOW
 #include "hps_0_arm_a9_0.h"

runtime/plcdata.cpp

@@ -0,0 +1,5 @@
+#include "plcdata.h"
+
+DataInterface<IO_AREA_SIZE> plc_inputs;
+DataInterface<IO_AREA_SIZE> plc_outputs;
+DataInterface<MEM_AREA_SIZE> plc_memory;

runtime/plcdata.h

@@ -0,0 +1,11 @@
+#ifndef PLCDATA_H
+#define PLCDATA_H
+
+#include "settings.h"
+#include "datainterface.h"
+
+extern DataInterface<IO_AREA_SIZE> plc_inputs;
+extern DataInterface<IO_AREA_SIZE> plc_outputs;
+extern DataInterface<MEM_AREA_SIZE> plc_memory;
+
+#endif // PLCDATA_H

runtime/runtime.pro

@@ -14,15 +14,14 @@ SOURCES += main.cpp \
     runtime.cpp \
     firmware_sample/firmware.cpp \
     firmware_sample/fwdb.cpp \
-    io.cpp \
     plcbus.cpp \
-    plcstate.cpp
+    plcstate.cpp \
+    plcdata.cpp
 
 HEADERS += \
     runtime.h \
     firmware_sample/firmware.h \
     firmware_sample/fwdb.h \
-    io.h \
     plcbus.h \
     settings.h \
     include/hps_0_arm_a9_0.h \
@@ -31,4 +30,5 @@ HEADERS += \
     include/hps_0.h \
     include/hps.h \
     plcstate.h \
-    datainterface.h
+    datainterface.h \
+    plcdata.h

runtime/settings.h

@@ -17,6 +17,7 @@
 #define BUS_MAX_MODULES_ON_RACK 32
 #define BUS_WAIT_TIME_MS 50
 
+#define MEM_AREA_SIZE   4096
 #define IO_AREA_SIZE 4096
 
 #define RT_ROOT_PATH "./"