x86: fix issue #168

bindings/go/keystone/keystone_const.go

@@ -72,30 +72,32 @@ const (
 		ERR_ASM_DIRECTIVE_RELOC_TOKEN Error = 135
 		ERR_ASM_DIRECTIVE_FPOINT Error = 136
 		ERR_ASM_DIRECTIVE_UNKNOWN Error = 137
-		ERR_ASM_VARIANT_INVALID Error = 138
-		ERR_ASM_DIRECTIVE_EQU Error = 139
-		ERR_ASM_EXPR_BRACKET Error = 140
-		ERR_ASM_SYMBOL_MODIFIER Error = 141
-		ERR_ASM_SYMBOL_REDEFINED Error = 142
-		ERR_ASM_SYMBOL_MISSING Error = 143
-		ERR_ASM_RPAREN Error = 144
-		ERR_ASM_STAT_TOKEN Error = 145
-		ERR_ASM_UNSUPPORTED Error = 146
-		ERR_ASM_MACRO_TOKEN Error = 147
-		ERR_ASM_MACRO_PAREN Error = 148
-		ERR_ASM_MACRO_EQU Error = 149
-		ERR_ASM_MACRO_ARGS Error = 150
-		ERR_ASM_MACRO_LEVELS_EXCEED Error = 151
-		ERR_ASM_MACRO_STR Error = 152
-		ERR_ASM_ESC_BACKSLASH Error = 153
-		ERR_ASM_ESC_OCTAL Error = 154
-		ERR_ASM_ESC_SEQUENCE Error = 155
-		ERR_ASM_ESC_STR Error = 156
-		ERR_ASM_TOKEN_INVALID Error = 157
-		ERR_ASM_INSN_UNSUPPORTED Error = 158
-		ERR_ASM_FIXUP_INVALID Error = 159
-		ERR_ASM_LABEL_INVALID Error = 160
-		ERR_ASM_FRAGMENT_INVALID Error = 161
+		ERR_ASM_DIRECTIVE_EQU Error = 138
+		ERR_ASM_DIRECTIVE_INVALID Error = 139
+		ERR_ASM_VARIANT_INVALID Error = 140
+		ERR_ASM_EXPR_BRACKET Error = 141
+		ERR_ASM_SYMBOL_MODIFIER Error = 142
+		ERR_ASM_SYMBOL_REDEFINED Error = 143
+		ERR_ASM_SYMBOL_MISSING Error = 144
+		ERR_ASM_RPAREN Error = 145
+		ERR_ASM_STAT_TOKEN Error = 146
+		ERR_ASM_UNSUPPORTED Error = 147
+		ERR_ASM_MACRO_TOKEN Error = 148
+		ERR_ASM_MACRO_PAREN Error = 149
+		ERR_ASM_MACRO_EQU Error = 150
+		ERR_ASM_MACRO_ARGS Error = 151
+		ERR_ASM_MACRO_LEVELS_EXCEED Error = 152
+		ERR_ASM_MACRO_STR Error = 153
+		ERR_ASM_MACRO_INVALID Error = 154
+		ERR_ASM_ESC_BACKSLASH Error = 155
+		ERR_ASM_ESC_OCTAL Error = 156
+		ERR_ASM_ESC_SEQUENCE Error = 157
+		ERR_ASM_ESC_STR Error = 158
+		ERR_ASM_TOKEN_INVALID Error = 159
+		ERR_ASM_INSN_UNSUPPORTED Error = 160
+		ERR_ASM_FIXUP_INVALID Error = 161
+		ERR_ASM_LABEL_INVALID Error = 162
+		ERR_ASM_FRAGMENT_INVALID Error = 163
 		ERR_ASM_INVALIDOPERAND Error = 512
 		ERR_ASM_MISSINGFEATURE Error = 513
 		ERR_ASM_MNEMONICFAIL Error = 514

bindings/nodejs/consts/keystone.js

@@ -48,30 +48,32 @@ module.exports.ERR_ASM_DIRECTIVE_RELOC_NAME = 134
 module.exports.ERR_ASM_DIRECTIVE_RELOC_TOKEN = 135
 module.exports.ERR_ASM_DIRECTIVE_FPOINT = 136
 module.exports.ERR_ASM_DIRECTIVE_UNKNOWN = 137
-module.exports.ERR_ASM_VARIANT_INVALID = 138
-module.exports.ERR_ASM_DIRECTIVE_EQU = 139
-module.exports.ERR_ASM_EXPR_BRACKET = 140
-module.exports.ERR_ASM_SYMBOL_MODIFIER = 141
-module.exports.ERR_ASM_SYMBOL_REDEFINED = 142
-module.exports.ERR_ASM_SYMBOL_MISSING = 143
-module.exports.ERR_ASM_RPAREN = 144
-module.exports.ERR_ASM_STAT_TOKEN = 145
-module.exports.ERR_ASM_UNSUPPORTED = 146
-module.exports.ERR_ASM_MACRO_TOKEN = 147
-module.exports.ERR_ASM_MACRO_PAREN = 148
-module.exports.ERR_ASM_MACRO_EQU = 149
-module.exports.ERR_ASM_MACRO_ARGS = 150
-module.exports.ERR_ASM_MACRO_LEVELS_EXCEED = 151
-module.exports.ERR_ASM_MACRO_STR = 152
-module.exports.ERR_ASM_ESC_BACKSLASH = 153
-module.exports.ERR_ASM_ESC_OCTAL = 154
-module.exports.ERR_ASM_ESC_SEQUENCE = 155
-module.exports.ERR_ASM_ESC_STR = 156
-module.exports.ERR_ASM_TOKEN_INVALID = 157
-module.exports.ERR_ASM_INSN_UNSUPPORTED = 158
-module.exports.ERR_ASM_FIXUP_INVALID = 159
-module.exports.ERR_ASM_LABEL_INVALID = 160
-module.exports.ERR_ASM_FRAGMENT_INVALID = 161
+module.exports.ERR_ASM_DIRECTIVE_EQU = 138
+module.exports.ERR_ASM_DIRECTIVE_INVALID = 139
+module.exports.ERR_ASM_VARIANT_INVALID = 140
+module.exports.ERR_ASM_EXPR_BRACKET = 141
+module.exports.ERR_ASM_SYMBOL_MODIFIER = 142
+module.exports.ERR_ASM_SYMBOL_REDEFINED = 143
+module.exports.ERR_ASM_SYMBOL_MISSING = 144
+module.exports.ERR_ASM_RPAREN = 145
+module.exports.ERR_ASM_STAT_TOKEN = 146
+module.exports.ERR_ASM_UNSUPPORTED = 147
+module.exports.ERR_ASM_MACRO_TOKEN = 148
+module.exports.ERR_ASM_MACRO_PAREN = 149
+module.exports.ERR_ASM_MACRO_EQU = 150
+module.exports.ERR_ASM_MACRO_ARGS = 151
+module.exports.ERR_ASM_MACRO_LEVELS_EXCEED = 152
+module.exports.ERR_ASM_MACRO_STR = 153
+module.exports.ERR_ASM_MACRO_INVALID = 154
+module.exports.ERR_ASM_ESC_BACKSLASH = 155
+module.exports.ERR_ASM_ESC_OCTAL = 156
+module.exports.ERR_ASM_ESC_SEQUENCE = 157
+module.exports.ERR_ASM_ESC_STR = 158
+module.exports.ERR_ASM_TOKEN_INVALID = 159
+module.exports.ERR_ASM_INSN_UNSUPPORTED = 160
+module.exports.ERR_ASM_FIXUP_INVALID = 161
+module.exports.ERR_ASM_LABEL_INVALID = 162
+module.exports.ERR_ASM_FRAGMENT_INVALID = 163
 module.exports.ERR_ASM_INVALIDOPERAND = 512
 module.exports.ERR_ASM_MISSINGFEATURE = 513
 module.exports.ERR_ASM_MNEMONICFAIL = 514

bindings/python/keystone/keystone_const.py

@@ -48,30 +48,32 @@ KS_ERR_ASM_DIRECTIVE_RELOC_NAME = 134
 KS_ERR_ASM_DIRECTIVE_RELOC_TOKEN = 135
 KS_ERR_ASM_DIRECTIVE_FPOINT = 136
 KS_ERR_ASM_DIRECTIVE_UNKNOWN = 137
-KS_ERR_ASM_VARIANT_INVALID = 138
-KS_ERR_ASM_DIRECTIVE_EQU = 139
-KS_ERR_ASM_EXPR_BRACKET = 140
-KS_ERR_ASM_SYMBOL_MODIFIER = 141
-KS_ERR_ASM_SYMBOL_REDEFINED = 142
-KS_ERR_ASM_SYMBOL_MISSING = 143
-KS_ERR_ASM_RPAREN = 144
-KS_ERR_ASM_STAT_TOKEN = 145
-KS_ERR_ASM_UNSUPPORTED = 146
-KS_ERR_ASM_MACRO_TOKEN = 147
-KS_ERR_ASM_MACRO_PAREN = 148
-KS_ERR_ASM_MACRO_EQU = 149
-KS_ERR_ASM_MACRO_ARGS = 150
-KS_ERR_ASM_MACRO_LEVELS_EXCEED = 151
-KS_ERR_ASM_MACRO_STR = 152
-KS_ERR_ASM_ESC_BACKSLASH = 153
-KS_ERR_ASM_ESC_OCTAL = 154
-KS_ERR_ASM_ESC_SEQUENCE = 155
-KS_ERR_ASM_ESC_STR = 156
-KS_ERR_ASM_TOKEN_INVALID = 157
-KS_ERR_ASM_INSN_UNSUPPORTED = 158
-KS_ERR_ASM_FIXUP_INVALID = 159
-KS_ERR_ASM_LABEL_INVALID = 160
-KS_ERR_ASM_FRAGMENT_INVALID = 161
+KS_ERR_ASM_DIRECTIVE_EQU = 138
+KS_ERR_ASM_DIRECTIVE_INVALID = 139
+KS_ERR_ASM_VARIANT_INVALID = 140
+KS_ERR_ASM_EXPR_BRACKET = 141
+KS_ERR_ASM_SYMBOL_MODIFIER = 142
+KS_ERR_ASM_SYMBOL_REDEFINED = 143
+KS_ERR_ASM_SYMBOL_MISSING = 144
+KS_ERR_ASM_RPAREN = 145
+KS_ERR_ASM_STAT_TOKEN = 146
+KS_ERR_ASM_UNSUPPORTED = 147
+KS_ERR_ASM_MACRO_TOKEN = 148
+KS_ERR_ASM_MACRO_PAREN = 149
+KS_ERR_ASM_MACRO_EQU = 150
+KS_ERR_ASM_MACRO_ARGS = 151
+KS_ERR_ASM_MACRO_LEVELS_EXCEED = 152
+KS_ERR_ASM_MACRO_STR = 153
+KS_ERR_ASM_MACRO_INVALID = 154
+KS_ERR_ASM_ESC_BACKSLASH = 155
+KS_ERR_ASM_ESC_OCTAL = 156
+KS_ERR_ASM_ESC_SEQUENCE = 157
+KS_ERR_ASM_ESC_STR = 158
+KS_ERR_ASM_TOKEN_INVALID = 159
+KS_ERR_ASM_INSN_UNSUPPORTED = 160
+KS_ERR_ASM_FIXUP_INVALID = 161
+KS_ERR_ASM_LABEL_INVALID = 162
+KS_ERR_ASM_FRAGMENT_INVALID = 163
 KS_ERR_ASM_INVALIDOPERAND = 512
 KS_ERR_ASM_MISSINGFEATURE = 513
 KS_ERR_ASM_MNEMONICFAIL = 514

bindings/ruby/keystone_gem/lib/keystone/keystone_const.rb

@@ -50,30 +50,32 @@ module Keystone
 	KS_ERR_ASM_DIRECTIVE_RELOC_TOKEN = 135
 	KS_ERR_ASM_DIRECTIVE_FPOINT = 136
 	KS_ERR_ASM_DIRECTIVE_UNKNOWN = 137
-	KS_ERR_ASM_VARIANT_INVALID = 138
-	KS_ERR_ASM_DIRECTIVE_EQU = 139
-	KS_ERR_ASM_EXPR_BRACKET = 140
-	KS_ERR_ASM_SYMBOL_MODIFIER = 141
-	KS_ERR_ASM_SYMBOL_REDEFINED = 142
-	KS_ERR_ASM_SYMBOL_MISSING = 143
-	KS_ERR_ASM_RPAREN = 144
-	KS_ERR_ASM_STAT_TOKEN = 145
-	KS_ERR_ASM_UNSUPPORTED = 146
-	KS_ERR_ASM_MACRO_TOKEN = 147
-	KS_ERR_ASM_MACRO_PAREN = 148
-	KS_ERR_ASM_MACRO_EQU = 149
-	KS_ERR_ASM_MACRO_ARGS = 150
-	KS_ERR_ASM_MACRO_LEVELS_EXCEED = 151
-	KS_ERR_ASM_MACRO_STR = 152
-	KS_ERR_ASM_ESC_BACKSLASH = 153
-	KS_ERR_ASM_ESC_OCTAL = 154
-	KS_ERR_ASM_ESC_SEQUENCE = 155
-	KS_ERR_ASM_ESC_STR = 156
-	KS_ERR_ASM_TOKEN_INVALID = 157
-	KS_ERR_ASM_INSN_UNSUPPORTED = 158
-	KS_ERR_ASM_FIXUP_INVALID = 159
-	KS_ERR_ASM_LABEL_INVALID = 160
-	KS_ERR_ASM_FRAGMENT_INVALID = 161
+	KS_ERR_ASM_DIRECTIVE_EQU = 138
+	KS_ERR_ASM_DIRECTIVE_INVALID = 139
+	KS_ERR_ASM_VARIANT_INVALID = 140
+	KS_ERR_ASM_EXPR_BRACKET = 141
+	KS_ERR_ASM_SYMBOL_MODIFIER = 142
+	KS_ERR_ASM_SYMBOL_REDEFINED = 143
+	KS_ERR_ASM_SYMBOL_MISSING = 144
+	KS_ERR_ASM_RPAREN = 145
+	KS_ERR_ASM_STAT_TOKEN = 146
+	KS_ERR_ASM_UNSUPPORTED = 147
+	KS_ERR_ASM_MACRO_TOKEN = 148
+	KS_ERR_ASM_MACRO_PAREN = 149
+	KS_ERR_ASM_MACRO_EQU = 150
+	KS_ERR_ASM_MACRO_ARGS = 151
+	KS_ERR_ASM_MACRO_LEVELS_EXCEED = 152
+	KS_ERR_ASM_MACRO_STR = 153
+	KS_ERR_ASM_MACRO_INVALID = 154
+	KS_ERR_ASM_ESC_BACKSLASH = 155
+	KS_ERR_ASM_ESC_OCTAL = 156
+	KS_ERR_ASM_ESC_SEQUENCE = 157
+	KS_ERR_ASM_ESC_STR = 158
+	KS_ERR_ASM_TOKEN_INVALID = 159
+	KS_ERR_ASM_INSN_UNSUPPORTED = 160
+	KS_ERR_ASM_FIXUP_INVALID = 161
+	KS_ERR_ASM_LABEL_INVALID = 162
+	KS_ERR_ASM_FRAGMENT_INVALID = 163
 	KS_ERR_ASM_INVALIDOPERAND = 512
 	KS_ERR_ASM_MISSINGFEATURE = 513
 	KS_ERR_ASM_MNEMONICFAIL = 514

bindings/rust/src/keystone_const.rs

@@ -117,30 +117,32 @@ bitflags! {
 		const ERR_ASM_DIRECTIVE_RELOC_TOKEN = 135,
 		const ERR_ASM_DIRECTIVE_FPOINT = 136,
 		const ERR_ASM_DIRECTIVE_UNKNOWN = 137,
-		const ERR_ASM_VARIANT_INVALID = 138,
-		const ERR_ASM_DIRECTIVE_EQU = 139,
-		const ERR_ASM_EXPR_BRACKET = 140,
-		const ERR_ASM_SYMBOL_MODIFIER = 141,
-		const ERR_ASM_SYMBOL_REDEFINED = 142,
-		const ERR_ASM_SYMBOL_MISSING = 143,
-		const ERR_ASM_RPAREN = 144,
-		const ERR_ASM_STAT_TOKEN = 145,
-		const ERR_ASM_UNSUPPORTED = 146,
-		const ERR_ASM_MACRO_TOKEN = 147,
-		const ERR_ASM_MACRO_PAREN = 148,
-		const ERR_ASM_MACRO_EQU = 149,
-		const ERR_ASM_MACRO_ARGS = 150,
-		const ERR_ASM_MACRO_LEVELS_EXCEED = 151,
-		const ERR_ASM_MACRO_STR = 152,
-		const ERR_ASM_ESC_BACKSLASH = 153,
-		const ERR_ASM_ESC_OCTAL = 154,
-		const ERR_ASM_ESC_SEQUENCE = 155,
-		const ERR_ASM_ESC_STR = 156,
-		const ERR_ASM_TOKEN_INVALID = 157,
-		const ERR_ASM_INSN_UNSUPPORTED = 158,
-		const ERR_ASM_FIXUP_INVALID = 159,
-		const ERR_ASM_LABEL_INVALID = 160,
-		const ERR_ASM_FRAGMENT_INVALID = 161,
+		const ERR_ASM_DIRECTIVE_EQU = 138,
+		const ERR_ASM_DIRECTIVE_INVALID = 139,
+		const ERR_ASM_VARIANT_INVALID = 140,
+		const ERR_ASM_EXPR_BRACKET = 141,
+		const ERR_ASM_SYMBOL_MODIFIER = 142,
+		const ERR_ASM_SYMBOL_REDEFINED = 143,
+		const ERR_ASM_SYMBOL_MISSING = 144,
+		const ERR_ASM_RPAREN = 145,
+		const ERR_ASM_STAT_TOKEN = 146,
+		const ERR_ASM_UNSUPPORTED = 147,
+		const ERR_ASM_MACRO_TOKEN = 148,
+		const ERR_ASM_MACRO_PAREN = 149,
+		const ERR_ASM_MACRO_EQU = 150,
+		const ERR_ASM_MACRO_ARGS = 151,
+		const ERR_ASM_MACRO_LEVELS_EXCEED = 152,
+		const ERR_ASM_MACRO_STR = 153,
+		const ERR_ASM_MACRO_INVALID = 154,
+		const ERR_ASM_ESC_BACKSLASH = 155,
+		const ERR_ASM_ESC_OCTAL = 156,
+		const ERR_ASM_ESC_SEQUENCE = 157,
+		const ERR_ASM_ESC_STR = 158,
+		const ERR_ASM_TOKEN_INVALID = 159,
+		const ERR_ASM_INSN_UNSUPPORTED = 160,
+		const ERR_ASM_FIXUP_INVALID = 161,
+		const ERR_ASM_LABEL_INVALID = 162,
+		const ERR_ASM_FRAGMENT_INVALID = 163,
 		const ERR_ASM_INVALIDOPERAND = 512,
 		const ERR_ASM_MISSINGFEATURE = 513,
 		const ERR_ASM_MNEMONICFAIL = 514,

include/keystone/keystone.h

@@ -107,8 +107,9 @@ typedef enum ks_err {
     KS_ERR_ASM_DIRECTIVE_RELOC_TOKEN, // unexpected token in .reloc directive
     KS_ERR_ASM_DIRECTIVE_FPOINT,    // invalid floating point in directive
     KS_ERR_ASM_DIRECTIVE_UNKNOWN,    // unknown directive
-    KS_ERR_ASM_VARIANT_INVALID, // invalid variant
     KS_ERR_ASM_DIRECTIVE_EQU,   // invalid equal directive
+    KS_ERR_ASM_DIRECTIVE_INVALID,   // (generic) invalid directive
+    KS_ERR_ASM_VARIANT_INVALID, // invalid variant
     KS_ERR_ASM_EXPR_BRACKET,    // brackets expression not supported on this target
     KS_ERR_ASM_SYMBOL_MODIFIER, // unexpected symbol modifier following '@'
     KS_ERR_ASM_SYMBOL_REDEFINED, // invalid symbol redefinition
@@ -122,6 +123,7 @@ typedef enum ks_err {
     KS_ERR_ASM_MACRO_ARGS,      // too many positional arguments
     KS_ERR_ASM_MACRO_LEVELS_EXCEED, // macros cannot be nested more than 20 levels deep
     KS_ERR_ASM_MACRO_STR,    // invalid macro string
+    KS_ERR_ASM_MACRO_INVALID,    // invalid macro (generic error)
     KS_ERR_ASM_ESC_BACKSLASH,   // unexpected backslash at end of escaped string
     KS_ERR_ASM_ESC_OCTAL,       // invalid octal escape sequence  (out of range)
     KS_ERR_ASM_ESC_SEQUENCE,         // invalid escape sequence (unrecognized character)

llvm/keystone/ks.cpp

@@ -116,6 +116,8 @@ const char *ks_strerror(ks_err code)
             return "Macros cannot be nested more than 20 levels deep (KS_ERR_ASM_MACRO_LEVELS_EXCEED)";
         case KS_ERR_ASM_MACRO_STR:         // invalid macro string
             return "Invalid macro string (KS_ERR_ASM_MACRO_STR)";
+        case KS_ERR_ASM_MACRO_INVALID:         // invalid macro string
+            return "Invalid macro (KS_ERR_ASM_MACRO_INVALID)";
         case KS_ERR_ASM_ESC_BACKSLASH:   // unexpected backslash at end of escaped string
             return "Unexpected backslash at end of escaped string (KS_ERR_ASM_ESC_BACKSLASH)";
         case KS_ERR_ASM_ESC_OCTAL:       // invalid octal escape sequence (out of range)
@@ -136,6 +138,8 @@ const char *ks_strerror(ks_err code)
             return "Invalid label (KS_ERR_ASM_LABEL_INVALID)";
         case KS_ERR_ASM_FRAGMENT_INVALID:
             return "Invalid fragment (KS_ERR_ASM_FRAGMENT_INVALID)";
+        case KS_ERR_ASM_DIRECTIVE_INVALID:
+            return "Invalid directive (KS_ERR_ASM_DIRECTIVE_INVALID)";
     }
 }