tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 07:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

1) make sure a empty database will be generated if the Uinitialized database portion is empty.

Browse Source 
2) add a newline at the end of Autogen.c for PCD driver/PEIM.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@606 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2006-06-23 06:40:50 +00:00
parent 58f1099f3d
commit 10d8dee566
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
View File

@ -116,7 +116,7 @@ class StringTable {
); );
declaList.add(decl); declaList.add(decl);
cInstCode = tab + " { 0 } " + String.format("/* %s */", stringTable) + commaNewLine; cInstCode = " { 0 } " + String.format("/* %s */", stringTable);
instTable.put(stringTable, cInstCode); instTable.put(stringTable, cInstCode);
} else { } else {
@ -1195,6 +1195,7 @@ class PcdDatabase {
// //
// Generate code for every alignment size // Generate code for every alignment size
// //
boolean uinitDatabaseEmpty = true;
for (int align = 8; align > 0; align >>= 1) { for (int align = 8; align > 0; align >>= 1) {
ArrayList<String> declaListBasedOnAlignment = alignmentInitDecl.get(new Integer(align)); ArrayList<String> declaListBasedOnAlignment = alignmentInitDecl.get(new Integer(align));
ArrayList<String> instListBasedOnAlignment = alignmentInitInst.get(new Integer(align)); ArrayList<String> instListBasedOnAlignment = alignmentInitInst.get(new Integer(align));
@ -1215,14 +1216,23 @@ class PcdDatabase {
} }
declaListBasedOnAlignment = alignmentUninitDecl.get(new Integer(align)); declaListBasedOnAlignment = alignmentUninitDecl.get(new Integer(align));
if (declaListBasedOnAlignment.size() != 0) {
uinitDatabaseEmpty = false;
}
for (Object d : declaListBasedOnAlignment) { for (Object d : declaListBasedOnAlignment) {
String s = (String)d; String s = (String)d;
uninitDeclStr += tab + s; uninitDeclStr += tab + s;
} }
} }
if (uinitDatabaseEmpty) {
uninitDeclStr += tab + " UINT8 dummy; /* PCD_DATABASE_UNINIT is emptry */\r\n";
}
initDeclStr += String.format("} %s_PCD_DATABASE_INIT;", phase) + newLine + newLine; initDeclStr += String.format("} %s_PCD_DATABASE_INIT;", phase) + newLine + newLine;
initInstStr += "};"; initInstStr += "};" + newLine;
uninitDeclStr += String.format("} %s_PCD_DATABASE_UNINIT;", phase) + newLine + newLine; uninitDeclStr += String.format("} %s_PCD_DATABASE_UNINIT;", phase) + newLine + newLine;
result.put("initDeclStr", initDeclStr); result.put("initDeclStr", initDeclStr);