Move declaration of obsolete opcodes to a separate include file.

diff --git a/ChangeLog b/ChangeLog
index 198454d0493af1052ea66bd919e5fd0f25ee890b..468b5a1f701101ffd3b03c5637ce9fbe5c35f133 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-22  Klaus Treichel  <ktreichel@web.de>
+
+       * config/jit-opcodes.ops: Move declaration of obsolete opcodes to
+       the separate include file jit-opcode-compat.h and include this new
+       file instead.
+
+       * include/jit/jit-opcode-compat.h: add new include file for
+       obsolete opcodes.
+
+       * include/jit/Makefile.am: add jit-opcode-compat.h to the include
+       sources.
+
 2011-12-18  Aleksey Demakov  <ademakov@gmail.com>
 
        * jit/Makefile.am:

diff --git a/config/jit-opcodes.ops b/config/jit-opcodes.ops
index 68a7fd99d38d5f58ef3d05b896ddc4535e799046..3be97e13ca8c745648861be019042a11545f831f 100644 (file)
--- a/config/jit-opcodes.ops
+++ b/config/jit-opcodes.ops
@@ -951,22 +951,7 @@ struct jit_opcode_info
 #endif
 JIT_EXPORT_DATA jit_opcode_info_t const jit_opcodes[JIT_OP_NUM_OPCODES];
 
-/*
- * Some obsolete opcodes that have been removed because they are duplicates
- * of other opcodes.
- */
-#define JIT_OP_FEQ_INV         JIT_OP_FEQ
-#define JIT_OP_FNE_INV         JIT_OP_FNE
-#define JIT_OP_DEQ_INV         JIT_OP_DEQ
-#define JIT_OP_DNE_INV         JIT_OP_DNE
-#define JIT_OP_NFEQ_INV                JIT_OP_NFEQ
-#define JIT_OP_NFNE_INV                JIT_OP_NFNE
-#define JIT_OP_BR_FEQ_INV      JIT_OP_BR_FEQ
-#define JIT_OP_BR_FNE_INV      JIT_OP_BR_FNE
-#define JIT_OP_BR_DEQ_INV      JIT_OP_BR_DEQ
-#define JIT_OP_BR_DNE_INV      JIT_OP_BR_DNE
-#define JIT_OP_BR_NFEQ_INV     JIT_OP_BR_NFEQ
-#define JIT_OP_BR_NFNE_INV     JIT_OP_BR_NFNE
+#include "jit-opcode-compat.h"
 
 #ifdef __cplusplus
 };

diff --git a/include/jit/Makefile.am b/include/jit/Makefile.am
index 5ad4bf45a99d871abcd7bb97d087ce6921235c8d..3e84067fdc3961d5cc25f7b3c1adaafce22f5ad2 100644 (file)
--- a/include/jit/Makefile.am
+++ b/include/jit/Makefile.am
@@ -22,6 +22,7 @@ dist_libjitinclude_HEADERS = \
        jit-meta.h \
        jit-objmodel.h \
        jit-objmodel-private.h \
+       jit-opcode-compat.h \
        jit-opcode.h \
        jit-plus.h \
        jit-type.h \

diff --git a/include/jit/jit-opcode-compat.h b/include/jit/jit-opcode-compat.h
new file mode 100644 (file)
index 0000000..706a14b
--- /dev/null
+++ b/include/jit/jit-opcode-compat.h
@@ -0,0 +1,50 @@
+/*
+ * jit-opcode-compat.h - Definition of obsolete opcodes for compatibility
+ *                                              reasons.
+ *
+ * Copyright (C) 2011  Southern Storm Software, Pty Ltd.
+ *
+ * The libjit library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation, either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * The libjit library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the libjit library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _JIT_OPCODE_COMPAT_H
+#define        _JIT_OPCODE_COMPAT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Some obsolete opcodes that have been removed because they are duplicates
+ * of other opcodes.
+ */
+#define JIT_OP_FEQ_INV         JIT_OP_FEQ
+#define JIT_OP_FNE_INV         JIT_OP_FNE
+#define JIT_OP_DEQ_INV         JIT_OP_DEQ
+#define JIT_OP_DNE_INV         JIT_OP_DNE
+#define JIT_OP_NFEQ_INV                JIT_OP_NFEQ
+#define JIT_OP_NFNE_INV                JIT_OP_NFNE
+#define JIT_OP_BR_FEQ_INV      JIT_OP_BR_FEQ
+#define JIT_OP_BR_FNE_INV      JIT_OP_BR_FNE
+#define JIT_OP_BR_DEQ_INV      JIT_OP_BR_DEQ
+#define JIT_OP_BR_DNE_INV      JIT_OP_BR_DNE
+#define JIT_OP_BR_NFEQ_INV     JIT_OP_BR_NFEQ
+#define JIT_OP_BR_NFNE_INV     JIT_OP_BR_NFNE
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _JIT_VMEM_H */