Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a bug of unreference PCD token defined in FPD does *not* be autogened into emulated PCD array. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@181 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2006-05-17 07:20:37 +00:00
parent f7f897daef
commit 98fc92fcbd
2 changed files with 133 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -489,6 +489,7 @@ public class CollectPCDAction {
// BUGBUG: in FPD, <defaultValue> should be defined as <Value> // BUGBUG: in FPD, <defaultValue> should be defined as <Value>
// //
token.datum = pcdBuildData.getDefaultValue(); token.datum = pcdBuildData.getDefaultValue();
token.tokenNumber = Integer.decode(pcdBuildData.getToken().getStringValue());
token.hiiEnabled = pcdBuildData.getHiiEnable(); token.hiiEnabled = pcdBuildData.getHiiEnable();
token.variableGuid = Token.getGUIDFromSchemaObject(pcdBuildData.getVariableGuid()); token.variableGuid = Token.getGUIDFromSchemaObject(pcdBuildData.getVariableGuid());
token.variableName = pcdBuildData.getVariableName(); token.variableName = pcdBuildData.getVariableName();

142
Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
View File

@ -221,10 +221,7 @@ public class PCDAutoGenAction extends BuildAction {
// Get one consumer instance and generate autogen for this token. // Get one consumer instance and generate autogen for this token.
// //
if(tokenArray[index].consumers != null ) { if(tokenArray[index].consumers != null ) {
if(tokenArray[index].consumers.size() == 0) { if(tokenArray[index].consumers.size() != 0) {
continue;
}
usageInstance = tokenArray[index].consumers.get(0); usageInstance = tokenArray[index].consumers.get(0);
try { try {
usageInstance.generateAutoGen(); usageInstance.generateAutoGen();
@ -237,6 +234,14 @@ public class PCDAutoGenAction extends BuildAction {
hAutoGenString += "\r\n"; hAutoGenString += "\r\n";
cAutoGenString += "\r\n"; cAutoGenString += "\r\n";
} else {
//
// If the PCD does *not* usded by any module, also generate
// it into autogen.h/autogen.c in Pcd driver according the
// information in FPD file.
//
generateUnReferencePcdAutogenString(tokenArray[index]);
}
} }
} }
@ -251,6 +256,111 @@ public class PCDAutoGenAction extends BuildAction {
} }
/**
Generate unreference token definition string for PCD emulated string.
Maybe some PCD token definition in FPD but not used by any module or library, we
should also generate token definition in autoge.h/autogen.c, because maybe some
driver loaded in shell will use this PCD.
@param token The token who want be generated autogen string.
**/
private void generateUnReferencePcdAutogenString(Token token) {
hAutoGenString += String.format("#define _PCD_TOKEN_%s 0x%016x\r\n",
token.cName, token.tokenNumber);
switch (token.pcdType) {
case FEATURE_FLAG:
hAutoGenString += String.format(
"#define _PCD_VALUE_%s %s\r\n",
token.cName,
token.datum.toString()
);
hAutoGenString += String.format(
"extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n",
token.cName
);
cAutoGenString += String.format(
"GLOBAL_REMOVE_IF_UNREFERENCED const BOOLEAN _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
token.cName,
token.cName
);
hAutoGenString += String.format(
"#define _PCD_MODE_%s_%s _PCD_VALUE_%s\r\n",
Token.GetAutogenDefinedatumTypeString(token.datumType),
token.cName,
token.cName
);
break;
case FIXED_AT_BUILD:
hAutoGenString += String.format(
"#define _PCD_VALUE_%s %s\r\n",
token.cName,
token.datum.toString()
);
hAutoGenString += String.format(
"extern const %s _gPcd_FixedAtBuild_%s;\r\n",
Token.getAutogendatumTypeString(token.datumType),
token.cName
);
cAutoGenString += String.format(
"GLOBAL_REMOVE_IF_UNREFERENCED const %s _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
Token.getAutogendatumTypeString(token.datumType),
token.cName,
token.cName
);
hAutoGenString += String.format(
"#define _PCD_MODE_%s_%s _PCD_VALUE_%s\r\n",
Token.GetAutogenDefinedatumTypeString(token.datumType),
token.cName,
token.cName
);
break;
case PATCHABLE_IN_MODULE:
hAutoGenString += String.format(
"#define _PCD_VALUE_%s %s\r\n",
token.cName,
token.datum.toString()
);
hAutoGenString += String.format(
"extern %s _gPcd_BinaryPatch_%s;\r\n",
Token.getAutogendatumTypeString(token.datumType),
token.cName
);
cAutoGenString += String.format(
"GLOBAL_REMOVE_IF_UNREFERENCED %s _gPcd_BinaryPatch_%s = _PCD_VALUE_%s;\r\n",
Token.getAutogendatumTypeString(token.datumType),
token.cName,
token.cName
);
hAutoGenString += String.format(
"#define _PCD_MODE_%s_%s _gPcd_BinaryPatch_%s\r\n",
Token.GetAutogenDefinedatumTypeString(token.datumType),
token.cName,
token.cName
);
break;
case DYNAMIC:
hAutoGenString += String.format(
"#define _PCD_MODE_%s_%s LibPcdGet%s(_PCD_TOKEN_%s)\r\n",
Token.GetAutogenDefinedatumTypeString(token.datumType),
token.cName,
Token.getAutogenLibrarydatumTypeString(token.datumType),
token.cName
);
break;
case DYNAMIC_EX:
break;
default:
ActionMessage.warning(this,
"The PCD_TYPE setted by platform is unknown"
);
}
hAutoGenString += "\r\n";
cAutoGenString += "\r\n";
}
/** /**
Generate PCDEmulated array in PCDEmulated driver for emulated runtime database. Generate PCDEmulated array in PCDEmulated driver for emulated runtime database.
@ -274,12 +384,6 @@ public class PCDAutoGenAction extends BuildAction {
for(index = 0; index < tokenArray.length; index ++) { for(index = 0; index < tokenArray.length; index ++) {
token = tokenArray[index]; token = tokenArray[index];
if((token.producers.size() == 0) &&(token.consumers.size() == 0)) {
//
// If no one use this PCD token, it will not generated in emulated array.
//
continue;
}
value = token.datum.toString(); value = token.datum.toString();
if(token.datumType == Token.DATUM_TYPE.POINTER) { if(token.datumType == Token.DATUM_TYPE.POINTER) {
if(!((value.charAt(0) == 'L' && value.charAt(1) == '"') ||(value.charAt(0) == '"'))) { if(!((value.charAt(0) == 'L' && value.charAt(1) == '"') ||(value.charAt(0) == '"'))) {
@ -299,13 +403,6 @@ public class PCDAutoGenAction extends BuildAction {
for(index = 0; index < tokenArray.length; index ++) { for(index = 0; index < tokenArray.length; index ++) {
token = tokenArray[index]; token = tokenArray[index];
if((token.producers.size() == 0) &&(token.consumers.size() == 0)) {
//
// If no one use this PCD token, it will not generated in emulated array.
//
continue;
}
if(index != 0) { if(index != 0) {
cAutoGenString += ",\r\n"; cAutoGenString += ",\r\n";
} }
@ -421,7 +518,7 @@ public class PCDAutoGenAction extends BuildAction {
@param argv paramter from command line @param argv paramter from command line
**/ **/
public static void main(String argv[]) { public static void main(String argv[]) {
String logFilePath = "G:/mdk/EdkNt32Pkg/build/Nt32.fpd"; String logFilePath = "M:/tianocore/edk2/trunk/edk2/EdkNt32Pkg/Nt32.fpd";
// //
// At first, CollectPCDAction should be invoked to collect // At first, CollectPCDAction should be invoked to collect
@ -429,12 +526,12 @@ public class PCDAutoGenAction extends BuildAction {
// //
CollectPCDAction collectionAction = new CollectPCDAction(); CollectPCDAction collectionAction = new CollectPCDAction();
GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db", GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db",
"G:/mdk"); "M:/tianocore/edk2/trunk/edk2");
GlobalData.getPCDMemoryDBManager().setLogFileName(logFilePath + ".PCDMemroyDatabaseLog.txt"); GlobalData.getPCDMemoryDBManager().setLogFileName(logFilePath + ".PCDMemroyDatabaseLog.txt");
try { try {
collectionAction.perform("G:/mdk", collectionAction.perform("M:/tianocore/edk2/trunk/edk2",
logFilePath, logFilePath,
ActionMessage.MAX_MESSAGE_LEVEL); ActionMessage.MAX_MESSAGE_LEVEL);
} catch(Exception e) { } catch(Exception e) {
@ -444,9 +541,12 @@ public class PCDAutoGenAction extends BuildAction {
// //
// Then execute the PCDAuotoGenAction to get generated Autogen.h and Autogen.c // Then execute the PCDAuotoGenAction to get generated Autogen.h and Autogen.c
// //
PCDAutoGenAction autogenAction = new PCDAutoGenAction("HelloWorld", PCDAutoGenAction autogenAction = new PCDAutoGenAction("PcdEmulator",
true true
); );
autogenAction.execute(); autogenAction.execute();
System.out.println (autogenAction.hAutoGenString);
System.out.println (autogenAction.cAutoGenString);
} }
} }