sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update input of disasmembler to support IfThen construct. Add prototype dos script to build BeagleBoard.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9936 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish
2010-02-05 06:50:09 +00:00
parent 3b9be4164b
commit f3198cba84
8 changed files with 304 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeagleBoardPkg/Library/EblCmdLib/EblCmdLib.c
View File

@@ -51,6 +51,7 @@ EblDisassembler (
UINT32 Address;
UINT32 Count;
CHAR8 Buffer[80];
UINT32 ItBlock;
if (Argc < 2) {
return EFI_INVALID_PARAMETER;
@@ -60,9 +61,10 @@ EblDisassembler (
Count = (Argc > 2) ? (UINT32)AsciiStrHexToUintn (Argv[2]) : 20;
Ptr = (UINT8 *)(UINTN)Address;
ItBlock = 0;
do {
CurrentAddress = Ptr;
DisassembleInstruction (&Ptr, TRUE, TRUE, Buffer, sizeof (Buffer));
DisassembleInstruction (&Ptr, TRUE, TRUE, &ItBlock, Buffer, sizeof (Buffer));
AsciiPrint ("0x%08x: %a\n", CurrentAddress, Buffer);
} while (Count-- > 0);

61
BeagleBoardPkg/Tools/generate_image.c
View File

@@ -11,14 +11,14 @@
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
//TOC structure as defined by OMAP35XX TRM.
typedef struct {
@@ -353,53 +353,52 @@ ConstructImage (
fclose(OutputFile);
}
int
main (
int argc,
char** argv
)
{
char Ch;
char Ch;
unsigned char *ptr;
int i;
int TwoArg;
if (argc == 1) {
PrintUsage ();
exit(1);
}
while ((Ch = getopt(argc, argv, "D:E:I:O:")) != -1) {
switch (Ch) {
case 'E': /* Image execution address */
gImageExecutionAddress = strtoul (optarg, (char **)&ptr, 16);
break;
case 'I': /* Input image file */
gInputImageFile = optarg;
break;
for (i=1; i < argc; i++) {
if (argv[i][0] == '-') {
// TwoArg TRUE -E 0x123, FALSE -E0x1234
TwoArg = (argv[i][2] != ' ');
switch (argv[i][1]) {
case 'E': /* Image execution address */
gImageExecutionAddress = strtoul (TwoArg ? argv[i+1] : &argv[i][2], (char **)&ptr, 16);
break;
case 'I': /* Input image file */
gInputImageFile = TwoArg ? argv[i+1] : &argv[i][2];
break;
case 'O': /* Output image file */
gOutputImageFile = optarg;
break;
case 'D': /* Data file */
gDataFile = optarg;
break;
case 'O': /* Output image file */
gOutputImageFile = TwoArg ? argv[i+1] : &argv[i][2];
break;
case 'D': /* Data file */
gDataFile = TwoArg ? argv[i+1] : &argv[i][2];
break;
case '?':
if ((optopt == 'E') || (optopt == 'I') || (optopt == 'O')) {
fprintf (stderr, "Option -%c requires an argument.\n", optopt);
} else if (isprint (optopt)) {
fprintf (stderr, "Unknown option `-%c'.\n", optopt);
} else {
fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt);
}
return 1;
default:
abort ();
default:
abort ();
}
printf ("\n%d(%x) - %s %s", i, TwoArg, argv[i], TwoArg ? argv[i+1] : &argv[i][2]);
}
}
//Prepare configuration header
PrepareConfigurationHeader ();

22
BeagleBoardPkg/Tools/makefile Executable file
View File

@@ -0,0 +1,22 @@
#
# Copyright (c) 2008-2009, Apple Inc. All rights reserved.
#
# All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
#
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
all: GenerateImage replace
GenerateImage: generate_image.c
$(CC) $(CCFLAGS) $(LDFLAGS) -o GenerateImage.exe generate_image.c
replace: replace.c
$(CC) $(CCFLAGS) $(LDFLAGS) -o replace.exe replace.c
clean:
del GenerateImage.exe generate_image.obj replace.exe replace.obj

123
BeagleBoardPkg/Tools/replace.c Executable file
View File

@@ -0,0 +1,123 @@
//
// Quick hack to work around not having sed, or any other reasonable
// way to edit a file from a script on Windows......
//
// Copyright (c) 2010, Apple Inc. All rights reserved.
//
// All rights reserved. This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
// which accompanies this distribution. The full text of the license may be found at
// http://opensource.org/licenses/bsd-license.php
//
// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#define TRUE 1
#define FALSE 0
typedef struct {
char *Match;
int MatchSize;
char *Replace;
} MATCH_PAIR;
//
// argv[1] - Old File
// argv[2] - New File
// argv[3+n] - Match String
// argv[4+n] - Replace string
int
main (int argc, char **argv)
{
FILE *In, *Out;
char *Key, *Replace;
int c, i, n, Len, MaxLenKey = 0, MinLenKey = INT_MAX;
unsigned long InFileSize, InFilePos;
MATCH_PAIR *Match;
int MaxMatch;
int ReadCount;
int Found;
if (argc < 5) {
// Need at least two files and two strings
return -1;
} else if ((argc % 2) == 0) {
// Match and Replace string must come in pairs
return -4;
}
In = fopen (argv[1], "r");
fseek (In, 0, SEEK_END);
InFileSize = ftell (In);
if (InFileSize == 0) {
return -6;
}
fseek (In, 0, SEEK_SET);
Out = fopen (argv[2], "w+");
if ((In == NULL) || (Out == NULL)) {
return -2;
}
MaxMatch = (argc - 2)/2;
printf ("\nMaxMatch = %d:%d\n", MaxMatch, argc);
Match = calloc (MaxMatch, sizeof (MATCH_PAIR));
if (Match == NULL) {
return -7;
}
for (n=0; n < MaxMatch; n++) {
Match[n].Match = argv[3 + n*2];
Match[n].MatchSize = strlen (argv[3 + n*2]);
Match[n].Replace = argv[3 + n*2 + 1];
printf ("%s > %s\n", Match[n].Match, Match[n].Replace);
if (Match[n].MatchSize > MaxLenKey) {
// Max size of match/replace string pair
MaxLenKey = Match[n].MatchSize;
}
if (Match[n].MatchSize < MinLenKey) {
MinLenKey = Match[n].MatchSize;
}
}
Key = malloc (MaxLenKey);
if (Key == NULL) {
return -5;
}
InFilePos = 0;
while (InFilePos < (InFileSize - MinLenKey)) {
fseek (In, InFilePos, SEEK_SET);
ReadCount = fread (Key, 1, MaxLenKey, In);
for (i = 0, Found = FALSE;i < MaxMatch; i++) {
if (ReadCount >= Match[i].MatchSize) {
if (!memcmp (Key, Match[i].Match, Match[i].MatchSize)) {
printf ("Found [%s] @ %u\n", Match[i].Match, InFilePos);
InFilePos += (Match[i].MatchSize - 1);
printf ("InFilePos = %u", InFilePos);
fputs (Match[i].Replace, Out);
Found = TRUE;
break;
}
}
}
if (!Found) {
fputc (Key[0], Out);
}
InFilePos++;
}
fclose (In);
fclose (Out);
free (Key);
return 0;
}

62
BeagleBoardPkg/b.bat Executable file
View File

@@ -0,0 +1,62 @@
@REM Copyright (c) 2008 - 2010, Apple, Inc. All rights reserved.
@REM All rights reserved. This program and the accompanying materials
@REM are licensed and made available under the terms and conditions of the BSD License
@REM which accompanies this distribution. The full text of the license may be found at
@REM http://opensource.org/licenses/bsd-license.php
@REM
@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@REM
@REM Example usage of this script. default is a DEBUG build
@REM b
@REM b clean
@REM b release
@REM b release clean
@REM b -v -y build.log
CALL ..\edksetup.bat
SET TARGET_TOOLS=RVCT31
SET TARGET=DEBUG
@if /I "%1"=="RELEASE" (
SET TARGET=RELEASE
shift /1
)
SET BUILD_ROOT=%WORKSPACE%\Build\BeagleBoard\%TARGET%_%TARGET_TOOLS%
BUILD_ROOT=$WORKSPACE/Build/BeagleBoard/"$TARGET"_"$TARGET_TOOLS"
CALL build -p BeagleBoardPkg\BeagleBoardPkg.dsc -a ARM -t RVCT31 -b %TARGET% %1 %2 %3 %4 %5 %6 %7 %8
@if /I "%1"=="CLEAN" goto Clean
@REM
@REM Ram starts at 0x80000000
@REM OMAP 3530 TRM defines 0x80008208 as the entry point
@REM The reset vector is caught by the mask ROM in the OMAP 3530 so that is why this entry
@REM point looks so strange.
@REM OMAP 3430 TRM section 26.4.8 has Image header information. (missing in OMAP 3530 TRM)
@REM
cd Tools
ECHO Building tools...
CALL nmake
ECHO Patching image with ConfigurationHeader.dat
CALL GenerateImage -D ConfigurationHeader.dat -E 0x80008208 -I ../../Build/FV/BEAGLEBOARD_EFI.fd -O ../../Build/FV/BeagleBoard_EFI_flashboot.fd
ECHO Patching ..\Debugger_scripts ...
SET DEBUGGER_SCRIPT=..\Debugger_scripts
for /f %%a IN ('dir /b %DEBUGGER_SCRIPT%\*.inc %DEBUGGER_SCRIPT%\*.cmm') do (
CALL replace %DEBUGGER_SCRIPT%\%%a %BUILD_ROOT%\%%a ZZZZZZ %BUILD_ROOT% WWWWWW %WORKSPACE%
)
cd ..
EXIT /B
:Clean
cd Tools
CALL nmake clean
cd ..