Changeset 439 for EcnlProtoTool/trunk/mruby-2.1.1/include/mruby/dump.h

Timestamp:

Jul 9, 2020, 8:51:43 AM (4 years ago)

Author:

coas-nagasima

Message:

mrubyを2.1.1に更新

Location:

EcnlProtoTool/trunk/mruby-2.1.1

Files:

• . (moved) (moved from EcnlProtoTool/trunk/mruby-1.3.0 )
• include/mruby/dump.h (modified) (8 diffs)

EcnlProtoTool/trunk/mruby-2.1.1/include/mruby/dump.h

@@ -1 @@
-/*
-** mruby/dump.h - mruby binary dumper (mrbc binary format)
+/**
+** @file mruby/dump.h - mruby binary dumper (mrbc binary format)
 **
 ** See Copyright Notice in mruby.h
@@ -32 +32 @@
 #endif
 MRB_API mrb_irep *mrb_read_irep(mrb_state*, const uint8_t*);
+MRB_API mrb_irep *mrb_read_irep_buf(mrb_state*, const void*, size_t);
 
 /* dump/load error code
@@ -53 +54 @@
 #define RITE_BINARY_IDENT              "RITE"
 #define RITE_BINARY_IDENT_LIL          "ETIR"
-#define RITE_BINARY_FORMAT_VER         "0004"
+#define RITE_BINARY_FORMAT_VER         "0006"
 #define RITE_COMPILER_NAME             "MATZ"
 #define RITE_COMPILER_VERSION          "0000"
 
-#define RITE_VM_VER                    "0000"
+#define RITE_VM_VER                    "0002"
 
 #define RITE_BINARY_EOF                "END\0"
 #define RITE_SECTION_IREP_IDENT        "IREP"
-#define RITE_SECTION_LINENO_IDENT      "LINE"
 #define RITE_SECTION_DEBUG_IDENT       "DBG\0"
 #define RITE_SECTION_LV_IDENT          "LVAR"
@@ -67 +67 @@
 #define MRB_DUMP_DEFAULT_STR_LEN      128
 #define MRB_DUMP_ALIGNMENT            sizeof(uint32_t)
-
-#ifdef __CA850__
-#pragma pack(1)
-#elif __RX
-#pragma pack
-#elif _MSC_VER
-#pragma pack(push, 1)
-#endif
-#ifndef __GNUC__
-#define __attribute__(x)
-#endif // !__GNUC__
 
 /* binary header */
@@ -87 +76 @@
   uint8_t compiler_name[4];   /* Compiler name */
   uint8_t compiler_version[4];
-} __attribute__((packed));
+};
 
 /* section header */
@@ -96 +85 @@
 struct rite_section_header {
   RITE_SECTION_HEADER;
-} __attribute__((packed));
+};
 
 struct rite_section_irep_header {
@@ -102 +91 @@
 
   uint8_t rite_version[4];    /* Rite Instruction Specification Version */
-} __attribute__((packed));
-
-struct rite_section_lineno_header {
-  RITE_SECTION_HEADER;
-} __attribute__((packed));
+};
 
 struct rite_section_debug_header {
   RITE_SECTION_HEADER;
-} __attribute__((packed));
+};
 
 struct rite_section_lv_header {
   RITE_SECTION_HEADER;
-} __attribute__((packed));
+};
 
 #define RITE_LV_NULL_MARK              UINT16_MAX
@@ -120 +105 @@
 struct rite_binary_footer {
   RITE_SECTION_HEADER;
-} __attribute__((packed));
-
-#ifdef __CA850__
-#pragma pack(8)
-#elif __RX
-#pragma unpack
-#elif _MSC_VER
-#pragma pack(pop)
-#endif
+};
 
 static inline int