Changeset e3fa1720 in mainline for tools/autocheck.awk

Timestamp:

2018-11-13T20:14:30Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2214382, 64f85f5

Parents:

6ae5e3f (diff), 9a791eb9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 20:14:30)

git-committer:

GitHub <noreply@…> (2018-11-13 20:14:30)

Message:

Remove realmode VESA code (#59)

Enables framebuffer initialization via multiboot1(multiboot2 already did it), and removes the obsolete code. Then deduplicates code for the two multiboots.

File:

• tools/autocheck.awk (modified) (1 diff)

tools/autocheck.awk

@@ -38 +38 @@
 
 /}.*;/ {
-        pattern = "}( __attribute__\\(.*\\))? (" struct_name "_t)?;"
-        if ($0 !~ pattern) {
-                print("Bad struct ending: " $0) > "/dev/stderr"
-                exit 1
+        pattern = "}( __attribute__\\(.*\\))? " struct_name "_t;"
+        if ($0 ~ pattern) {
+                macro_name = toupper(struct_name) "_SIZE"
+                print "_Static_assert(" macro_name " == sizeof(struct " struct_name "), \"\");"
+                struct_name = ""
         }
-        macro_name = toupper(struct_name) "_SIZE"
-        print "_Static_assert(" macro_name " == sizeof(struct " struct_name "), \"\");"
-        struct_name = ""
 }
 
 /;$/ {
-        if (struct_name != "") {
+        if (struct_name != "" && $0 !~ "}") {
                 # Remove array subscript, if any.
                 sub("(\\[.*\\])?;", "", $0)