Fix several issues:

Misreplace library name
Support commenting out nonlocal header files for dxs FileArg.class
Add a new protocol Guid to database 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1864 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2006-10-30 11:57:37 +00:00
parent a7081d204a
commit a7a7033316
5 changed files with 9 additions and 6 deletions

View File

@ -37,7 +37,7 @@ EfiDriverLib,EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx,UefiLib,MdePk
EfiDriverLib,EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx,UefiLib,MdePkg
EfiDriverLib,EfiInitializeFwVolDevicepathNode,EfiInitializeFwVolDevicepathNode,UefiLib,MdePkg
EfiDriverLib,EfiGetNameGuidFromFwVolDevicePathNode,EfiGetNameGuidFromFwVolDevicePathNode,UefiLib,MdePkg
EfiDriverLib,EfiLibReportStatusCode,ReportStatusCode,ReportStatusCodeLib,MdePkg
EfiDriverLib,EfiLibReportStatusCode,gRT->ReportStatusCode,ReportStatusCodeLib,MdePkg
EfiDriverLib,ReportStatusCodeWithDevicePath,ReportStatusCodeWithDevicePath,ReportStatusCodeLib,MdePkg
EfiDriverLib,EFI_FIELD_OFFSET,EFI_FIELD_OFFSET,BaseLib,MdePkg
EfiDriverLib,EFI_LIST,LIST_ENTRY,BaseLib,MdePkg
@ -71,7 +71,7 @@ EfiCommonLib,BufToHexString,R8_BufToHexString,%,MdePkg
EfiCommonLib,CHARACTER_NUMBER_FOR_VALUE,MAXIMUM_VALUE_CHARACTERS,PrintLib,MdePkg
EfiCommonLib,CodeTypeToPostCode,CodeTypeToPostCode,ReportStatusCodeLib,MdePkg
EfiCommonLib,COMMA_TYPE,COMMA_TYPE,PrintLib,MdePkg
EfiCommonLib,DivU64x32,DivU64x64Remainder ,BaseLib,MdePkg
EfiCommonLib,DivU64x32,DivU64x64Remainder,BaseLib,MdePkg
EfiCommonLib,EfiAsciiStrCpy,AsciiStrCpy,BaseLib,MdePkg
EfiCommonLib,EfiAsciiStrLen,AsciiStrLen,BaseLib,MdePkg
EfiCommonLib,EfiCommonIoRead,n/a,n/a,MdePkg

1 R8.5LibClass R8.5Lib R9Lib R9LibClass Package
37 EfiDriverLib EfiCreateEventLegacyBoot EfiCreateEventLegacyBootEx UefiLib MdePkg
38 EfiDriverLib EfiInitializeFwVolDevicepathNode EfiInitializeFwVolDevicepathNode UefiLib MdePkg
39 EfiDriverLib EfiGetNameGuidFromFwVolDevicePathNode EfiGetNameGuidFromFwVolDevicePathNode UefiLib MdePkg
40 EfiDriverLib EfiLibReportStatusCode ReportStatusCode gRT->ReportStatusCode ReportStatusCodeLib MdePkg
41 EfiDriverLib ReportStatusCodeWithDevicePath ReportStatusCodeWithDevicePath ReportStatusCodeLib MdePkg
42 EfiDriverLib EFI_FIELD_OFFSET EFI_FIELD_OFFSET BaseLib MdePkg
43 EfiDriverLib EFI_LIST LIST_ENTRY BaseLib MdePkg
71 EfiCommonLib CHARACTER_NUMBER_FOR_VALUE MAXIMUM_VALUE_CHARACTERS PrintLib MdePkg
72 EfiCommonLib CodeTypeToPostCode CodeTypeToPostCode ReportStatusCodeLib MdePkg
73 EfiCommonLib COMMA_TYPE COMMA_TYPE PrintLib MdePkg
74 EfiCommonLib DivU64x32 DivU64x64Remainder DivU64x64Remainder BaseLib MdePkg
75 EfiCommonLib EfiAsciiStrCpy AsciiStrCpy BaseLib MdePkg
76 EfiCommonLib EfiAsciiStrLen AsciiStrLen BaseLib MdePkg
77 EfiCommonLib EfiCommonIoRead n/a n/a MdePkg

View File

@ -143,3 +143,4 @@ IsaIo,gEfiIsaIoProtocolGuid,gEfiIsaIoProtocolGuid,7EE2BD44-3DA0-11D4-9A38-009027
IsaAcpi,gEfiIsaAcpiProtocolGuid,gEfiIsaAcpiProtocolGuid,64A892DC-5561-4536-92C7-799BFC183355,EdkModulePkg
Performance,gPerformanceProtocolGuid,gPerformanceProtocolGuid,76B6BDFA-2ACD-4462-9E3F-CB58C969D937,EdkModulePkg
ScsiIo,gEfiScsiIoProtocolGuid,gEfiScsiIoProtocolGuid,403CD195-F233-48EC-8455-B2E52F1D9E02,EdkModulePkg
ApciSupport,gEfiAcpiSupportGuid,gEfiAcpiSupportProtocolGuid,DBFF9D55-89B7-46DA-BDDF-677D3DC0241D,MdePkg

1 Name R8.5 Cname R9 Cname Guid Value Package
143 IsaAcpi gEfiIsaAcpiProtocolGuid gEfiIsaAcpiProtocolGuid 64A892DC-5561-4536-92C7-799BFC183355 EdkModulePkg
144 Performance gPerformanceProtocolGuid gPerformanceProtocolGuid 76B6BDFA-2ACD-4462-9E3F-CB58C969D937 EdkModulePkg
145 ScsiIo gEfiScsiIoProtocolGuid gEfiScsiIoProtocolGuid 403CD195-F233-48EC-8455-B2E52F1D9E02 EdkModulePkg
146 ApciSupport gEfiAcpiSupportGuid gEfiAcpiSupportProtocolGuid DBFF9D55-89B7-46DA-BDDF-677D3DC0241D MdePkg

View File

@ -222,7 +222,7 @@ EfiLibAllocateRuntimeZeroPool,AllocateRuntimeZeroPool
EfiLibAllocateZeroPool,AllocateZeroPool
EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx
EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx
EfiLibReportStatusCode,ReportStatusCode
EfiLibReportStatusCode,gRT->ReportStatusCode
EFI_LIST,LIST_ENTRY
EFI_LIST_ENTRY,LIST_ENTRY
EFI_LIST_NODE,LIST_ENTRY
@ -319,3 +319,4 @@ PEI_CR,CR
PEI_DEBUG,DEBUG#
PEI_DEBUG_CODE,DEBUG_CODE#
PEI_DEBUG_SET_MEMORY,DEBUG_CLEAR_MEMORY
gEfiAcpiSupportGuid,gEfiAcpiSupportProtocolGuid

1 R8.5 Name R9 Name
222 EfiLibAllocateZeroPool AllocateZeroPool
223 EfiCreateEventReadyToBoot EfiCreateEventReadyToBootEx
224 EfiCreateEventLegacyBoot EfiCreateEventLegacyBootEx
225 EfiLibReportStatusCode ReportStatusCode gRT->ReportStatusCode
226 EFI_LIST LIST_ENTRY
227 EFI_LIST_ENTRY LIST_ENTRY
228 EFI_LIST_NODE LIST_ENTRY
319 PEI_DEBUG DEBUG#
320 PEI_DEBUG_CODE DEBUG_CODE#
321 PEI_DEBUG_SET_MEMORY DEBUG_CLEAR_MEMORY
322 gEfiAcpiSupportGuid gEfiAcpiSupportProtocolGuid

View File

@ -310,7 +310,7 @@ public final class ModuleReader implements Common.ForDoAll {
}
public boolean recognize(String filename) {
return filename.contains(".c") || filename.contains(".h");
return filename.contains(".c") || filename.contains(".h") || filename.contains(".dxs");
}
public String namechange(String oldname) {

View File

@ -315,7 +315,8 @@ public final class SourceFileReplacer implements Common.ForDoAll {
if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {
if (!r8thing.equals(r9thing)) {
if (wholeline.contains(r8thing)) {
wholeline = wholeline.replaceAll(r8thing, r9thing);
String findString = "(?<!(?:\\d|\\w))" + r8thing + "(?!(?:\\d|\\w))";
wholeline = wholeline.replaceAll(findString, r9thing);
filefunc.add(new r8tor9(r8thing, r9thing));
Iterator<r8tor9> rt = filefunc.iterator();
while (rt.hasNext()) {