summaryrefslogtreecommitdiffstats
path: root/resources/utilities/ich9deblob
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-12-22 10:02:37 (EST)
committer Francis Rowe <info@gluglug.org.uk>2014-12-22 10:02:37 (EST)
commitc7348384dc0ef7e4d420878c910d93148bf1cbc1 (patch)
treed9f70f8393c892dbd97fe520f0994d18a536590c /resources/utilities/ich9deblob
parent2ef2a35be436b7b82e61a5329db08cad446b9532 (diff)
downloadlibreboot-c7348384dc0ef7e4d420878c910d93148bf1cbc1.zip
libreboot-c7348384dc0ef7e4d420878c910d93148bf1cbc1.tar.gz
libreboot-c7348384dc0ef7e4d420878c910d93148bf1cbc1.tar.bz2
ich9deblob: move struct size checks to a separate function
Diffstat (limited to 'resources/utilities/ich9deblob')
-rw-r--r--resources/utilities/ich9deblob/ich9deblob.c31
1 files changed, 18 insertions, 13 deletions
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/ich9deblob.c
index c12f758..bd980b9 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/ich9deblob.c
@@ -62,6 +62,22 @@ unsigned short gbeGetChecksumFrom8kBuffer(char* buffer, unsigned short desiredVa
unsigned short gbeGetRegionWordFrom8kBuffer(int i, char* buffer); // used for getting each word needed to calculate said checksum
struct DESCRIPTORREGIONRECORD deblobbedFromFactory(struct DESCRIPTORREGIONRECORD factoryDescriptorStruct, int romSize);
+// Basically, this should only return true on non-x86 machines
+int structSizesIncorrect(struct DESCRIPTORREGIONRECORD descriptorDummy, struct GBEREGIONRECORD_8K gbe8kDummy) {
+ unsigned int descriptorRegionStructSize = sizeof(descriptorDummy);
+ unsigned int gbeRegion8kStructSize = sizeof(gbe8kDummy);
+ // check compiler bit-packs in a compatible way. basically, it is expected that this code will be used on x86
+ if (DESCRIPTORREGIONSIZE != descriptorRegionStructSize){
+ printf("\nerror: compiler incompatibility: descriptor struct length is %i bytes (should be %i)\n", descriptorRegionStructSize, DESCRIPTORREGIONSIZE);
+ return 1;
+ }
+ if (GBEREGIONSIZE != gbeRegion8kStructSize){
+ printf("\nerror: compiler incompatibility: gbe struct length is %i bytes (should be %i)\n", gbeRegion8kStructSize, GBEREGIONSIZE);
+ return 1;
+ }
+ return 0;
+}
+
int main(int argc, char *argv[])
{
@@ -69,23 +85,12 @@ int main(int argc, char *argv[])
// and then it will be modified (deblobbed) to remove the ME/AMT
struct DESCRIPTORREGIONRECORD factoryDescriptorStruct;
struct DESCRIPTORREGIONRECORD deblobbedDescriptorStruct;
- unsigned int descriptorRegionStructSize = sizeof(factoryDescriptorStruct);
- // check compiler bit-packs in a compatible way. basically, it is expected that this code will be used on x86
- if (DESCRIPTORREGIONSIZE != descriptorRegionStructSize){
- printf("\nerror: compiler incompatibility: descriptor struct length is %i bytes (should be %i)\n", descriptorRegionStructSize, DESCRIPTORREGIONSIZE);
- return 1;
- }
-
// gbe region. Well have actual gbe buffer mapped to it (from the factory.rom dump)
// and then it will be modified to correct the main region
struct GBEREGIONRECORD_8K factoryGbeStruct8k;
struct GBEREGIONRECORD_8K deblobbedGbeStruct8k;
- unsigned int gbeRegion8kStructSize = sizeof(factoryGbeStruct8k);
- // check compiler bit-packs in a compatible way. basically, it is expected that this code will be used on x86
- if (GBEREGIONSIZE != gbeRegion8kStructSize){
- printf("\nerror: compiler incompatibility: gbe struct length is %i bytes (should be %i)\n", gbeRegion8kStructSize, GBEREGIONSIZE);
- return 1;
- }
+
+ if (structSizesIncorrect(factoryDescriptorStruct, factoryGbeStruct8k)) return 1;
// endianness check. big endian forced to fail
unsigned short steak = 0xBEEF;