git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1586 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
alfred 2006-09-21 05:29:00 +00:00
parent 61249ae523
commit 55bfa0f1ae
4 changed files with 7 additions and 16 deletions

View File

@ -26,7 +26,7 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList
private static final FirstPanel INSTANCE = FirstPanel.init(); private static final FirstPanel INSTANCE = FirstPanel.init();
private String startpath; private String startpath = null;
private JButton moduleButton, goButton, msaEditorButton, criticButton, specifyCommentButton; private JButton moduleButton, goButton, msaEditorButton, criticButton, specifyCommentButton;
private JTextField moduletext; private JTextField moduletext;

View File

@ -73,7 +73,11 @@ public class MigrationTool {
MigrationTool.ui.println(show + hash.size()); MigrationTool.ui.println(show + hash.size());
MigrationTool.ui.println(hash); MigrationTool.ui.println(hash);
} }
/*
public static final String getTempDir(String modulepath) {
return "C:" + File.separator + "MigrationTool_Temp" + File.separator + modulepath.replaceAll(ui., arg1);
}
*/
private static final String assignOutPutPath(String inputpath) { private static final String assignOutPutPath(String inputpath) {
if (MigrationTool.defaultoutput) { if (MigrationTool.defaultoutput) {
return inputpath.replaceAll(Common.STRSEPARATER, "$1"); return inputpath.replaceAll(Common.STRSEPARATER, "$1");

View File

@ -193,13 +193,11 @@ public final class ModuleReader implements Common.ForDoAll {
ii = mi.preprocessedccodes.iterator(); ii = mi.preprocessedccodes.iterator();
Pattern patefifuncc = Pattern.compile("g?(BS|RT)\\s*->\\s*([a-zA-Z_]\\w*)",Pattern.MULTILINE); Pattern patefifuncc = Pattern.compile("g?(BS|RT)\\s*->\\s*([a-zA-Z_]\\w*)",Pattern.MULTILINE);
Pattern patentrypoint = Pattern.compile("EFI_([A-Z]*)_ENTRY_POINT\\s*\\(([^\\(\\)]*)\\)",Pattern.MULTILINE);
Matcher matguid; Matcher matguid;
Matcher matfuncc; Matcher matfuncc;
Matcher matfuncd; Matcher matfuncd;
Matcher matenclosereplace; Matcher matenclosereplace;
Matcher matefifuncc; Matcher matefifuncc;
Matcher matentrypoint;
Matcher matmacro; Matcher matmacro;
while (ii.hasNext()) { while (ii.hasNext()) {
@ -211,17 +209,6 @@ public final class ModuleReader implements Common.ForDoAll {
} }
line = wholefile.toString(); line = wholefile.toString();
// if this is a Pei phase module , add these library class to .msa
matentrypoint = patentrypoint.matcher(line);
if (matentrypoint.find()) {
mi.entrypoint = matentrypoint.group(2);
if (matentrypoint.group(1).matches("PEIM")) {
mi.hashrequiredr9libs.add("PeimEntryPoint");
} else {
mi.hashrequiredr9libs.add("UefiDriverEntryPoint");
}
}
// find guid // find guid
matguid = Guid.ptnguid.matcher(line); // several ways to implement this , which one is faster ? : matguid = Guid.ptnguid.matcher(line); // several ways to implement this , which one is faster ? :
while (matguid.find()) { // 1.currently , find once , then call to identify which is it while (matguid.find()) { // 1.currently , find once , then call to identify which is it

View File

@ -168,7 +168,7 @@ public class MsaWriter {
} }
it = mi.hashrequiredr9libs.iterator(); it = mi.hashrequiredr9libs.iterator();
while (it.hasNext()) { while (it.hasNext()) {
if ((temp = it.next()) != null && !temp.matches("%")) { if ((temp = it.next()) != null && !temp.matches("%") && !temp.matches("n/a")) {
LibraryClassDocument.LibraryClass lc = libclassdefs.addNewLibraryClass(); LibraryClassDocument.LibraryClass lc = libclassdefs.addNewLibraryClass();
lc.setKeyword(temp); lc.setKeyword(temp);
lc.setUsage(UsageTypes.ALWAYS_CONSUMED); lc.setUsage(UsageTypes.ALWAYS_CONSUMED);