jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2024-11-22 07:58:22 +08:00
Code Issues Projects Releases Wiki Activity

Fix truncation issue with 64-bit contants on Windows, update Kaitai patch script

Browse Source
This commit is contained in:
Nikolaj Schlej 2023-02-03 23:53:10 -08:00
parent f02f828571
commit 7a161f577a
5 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/generated/intel_acbp_v1.h
View File

@ -31,7 +31,7 @@ public:
IBB_SEGMENT_TYPE_NON_IBB = 1 IBB_SEGMENT_TYPE_NON_IBB = 1
}; };
enum structure_ids_t { enum structure_ids_t : uint64_t {
STRUCTURE_IDS_PMDA = 6872283318001360735LL, STRUCTURE_IDS_PMDA = 6872283318001360735LL,
STRUCTURE_IDS_PMSG = 6872289979495636831LL, STRUCTURE_IDS_PMSG = 6872289979495636831LL,
STRUCTURE_IDS_ACBP = 6872299801917087583LL, STRUCTURE_IDS_ACBP = 6872299801917087583LL,

2
common/generated/intel_acbp_v2.h
View File

@ -30,7 +30,7 @@ public:
IBB_SEGMENT_TYPE_NON_IBB = 1 IBB_SEGMENT_TYPE_NON_IBB = 1
}; };
enum structure_ids_t { enum structure_ids_t : uint64_t {
STRUCTURE_IDS_PMDA = 6872283318001360735LL, STRUCTURE_IDS_PMDA = 6872283318001360735LL,
STRUCTURE_IDS_PMSG = 6872289979495636831LL, STRUCTURE_IDS_PMSG = 6872289979495636831LL,
STRUCTURE_IDS_ACBP = 6872299801917087583LL, STRUCTURE_IDS_ACBP = 6872299801917087583LL,

2
common/generated/intel_keym_v1.h
View File

@ -18,7 +18,7 @@ public:
class signature_t; class signature_t;
class key_signature_t; class key_signature_t;
enum structure_ids_t { enum structure_ids_t : uint64_t {
STRUCTURE_IDS_KEYM = 6872296602200661855LL STRUCTURE_IDS_KEYM = 6872296602200661855LL
}; };

2
common/generated/intel_keym_v2.h
View File

@ -20,7 +20,7 @@ public:
class public_key_t; class public_key_t;
class header_t; class header_t;
enum structure_ids_t { enum structure_ids_t : uint64_t {
STRUCTURE_IDS_KEYM = 6872296602200661855LL STRUCTURE_IDS_KEYM = 6872296602200661855LL
}; };

29
kaitai_regenerate.sh
View File

@ -5,13 +5,17 @@ UTARGET=$(uname)
# Determine platform # Determine platform
if [ "$UTARGET" = "Darwin" ]; then if [ "$UTARGET" = "Darwin" ]; then
export UPLATFORM="mac" export UPLATFORM="mac"
export UFIND="find -E"
export UFINDOPT=""
export USEDOPT="''"
elif [ "$UTARGET" = "Linux" ]; then elif [ "$UTARGET" = "Linux" ]; then
export UPLATFORM="linux_$(uname -m)" export UPLATFORM="linux_$(uname -m)"
elif [ "${UTARGET/MINGW32/}" != "$UTARGET" ]; then export UFIND="find"
export UPLATFORM="win32" export UFINDOPT="-regextype posix-extended"
export USEDOPT=""
else else
# Fallback to something...
export UPLATFORM="$UTARGET" export UPLATFORM="$UTARGET"
echo "Please run this script on Linux or macOS"
fi fi
# Generate # Generate
@ -19,23 +23,28 @@ echo "Attempting to to generate parsers from Kaitai KSY files on ${UPLATFORM}...
kaitai-struct-compiler --target cpp_stl --outdir common/generated common/ksy/* || exit 1 kaitai-struct-compiler --target cpp_stl --outdir common/generated common/ksy/* || exit 1
# Show generated files # Show generated files
find -E common/generated \ ${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(cpp|h)' \ -regex '.*\.(cpp|h)' \
-print || exit 1 -print || exit 1
# Replace global includes for kaitai with local ones (<> -> "") # Replace global includes for kaitai with local ones (<> -> "")
find -E common/generated \ ${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(cpp|h)' \ -regex '.*\.(cpp|h)' \
-exec sed -i '' '/^#include <kaitai/s/[<>]/\"/g' {} + || exit 1 -exec sed -i ${USEDOPT} '/^#include <kaitai/s/[<>]/\"/g' {} + || exit 1
# Add .. to the include path for kaitai includes # Add .. to the include path for kaitai includes
find -E common/generated \ ${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(cpp|h)' \ -regex '.*\.(cpp|h)' \
-exec sed -i '' '/^#include \"kaitai\//s/kaitai\//..\/kaitai\//g' {} + || exit 1 -exec sed -i ${USEDOPT} '/^#include \"kaitai\//s/kaitai\//..\/kaitai\//g' {} + || exit 1
# Suppress "p__root - unused parameter" warning # Suppress "p__root - unused parameter" warning
find -E common/generated \ ${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(cpp)' \ -regex '.*\.(cpp)' \
-exec sed -i '' '/^ m__root = this;/s/;/; (void)p__root;/g' {} + || exit 1 -exec sed -i ${USEDOPT} '/^ m__root = this;/s/;/; (void)p__root;/g' {} + || exit 1
# Add uint64_t to enum structure_ids_t
${UFIND} common/generated ${UFINDOPT} \
-regex '.*\.(h)' \
-exec sed -i ${USEDOPT} '/^ enum structure_ids_t {/s/{/: uint64_t {/g' {} + || exit 1
exit 0 exit 0