Used unique identifiers for instructions everywhere.

1 files changed, 15 insertions, 3 deletions

diff --git a/tools/d2c/d2c.c b/tools/d2c/d2c.c
index ee28af4..1d9b5b6 100644
--- a/tools/d2c/d2c.c
+++ b/tools/d2c/d2c.c
@@ -287,12 +287,18 @@ int main(int argc, char **argv)
             status = output_coder_identifier(coder, &info);
             if (!status) goto clean_exit;
 
-            if (info.type == IOT_FORMAT)
+            if (info.type == IOT_RAW)
             {
-                status = output_coder_keyword(coder, &info);
+                status = output_coder_sub_identifier(coder, &info);
                 if (!status) goto clean_exit;
             }
 
+            status = output_coder_keyword(coder, &info);
+            if (!status) goto clean_exit;
+
+            status = output_coder_hooks(coder, &info);
+            if (!status) goto clean_exit;
+
             status = output_coder_description(coder, &info);
             if (!status) goto clean_exit;
 
@@ -316,9 +322,15 @@ int main(int argc, char **argv)
             else if (strcmp(base, "identifiers.h") == 0)
                 status = fini_coder_identifiers_file(argv[optind], &info);
 
-            else if (info.type == IOT_FORMAT && strcmp(base, "keywords.h") == 0)
+            else if (strcmp(base, "subidentifiers.h") == 0 && info.type == IOT_RAW)
+                status = fini_coder_sub_identifiers_file(argv[optind], &info);
+
+            else if (strcmp(base, "keywords.h") == 0)
                 status = fini_coder_keywords_file(argv[optind], &info);
 
+            else if (strcmp(base, "hooks.h") == 0)
+                status = fini_coder_hooks_file(argv[optind], &info);
+
             else if (strcmp(base, "descriptions.h") == 0)
                 status = fini_coder_descriptions_file(argv[optind], &info);