diff options
| author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-30 23:38:40 +0000 |
|---|---|---|
| committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-30 23:38:40 +0000 |
| commit | 2ff79f2eda16f8219140d3dae188d2b341f610e1 (patch) | |
| tree | 693b0c0223c7f3a312f292a3a5ba9eff0def4dbe /UnixPkg/Library | |
| parent | e23a349aaec2ba7fd4218c6dabaf42da0aa9aa8e (diff) | |
| download | edk2-platforms-2ff79f2eda16f8219140d3dae188d2b341f610e1.tar.xz | |
Adding Simple Pointer, GOP, SimpleTextInEx, and Networking protocols to the emulator. Cleaned up POSIX include situation by centralizing it in a single file, like NT32. Fixed TPL issue with TPL High not being emulated correctly, it was possible to take a timer tick when the locks in the DXE core should have prevented this. Remove some unused files to make things easier to maintain.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11105 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UnixPkg/Library')
| -rw-r--r-- | UnixPkg/Library/UnixBaseLib/X64/SwitchStack.S | 5 | ||||
| -rw-r--r-- | UnixPkg/Library/UnixBdsLib/PlatformData.c | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/UnixPkg/Library/UnixBaseLib/X64/SwitchStack.S b/UnixPkg/Library/UnixBaseLib/X64/SwitchStack.S index 3a84b0d22f..fd7ba6e717 100644 --- a/UnixPkg/Library/UnixBaseLib/X64/SwitchStack.S +++ b/UnixPkg/Library/UnixBaseLib/X64/SwitchStack.S @@ -40,12 +40,9 @@ ASM_PFX(InternalSwitchStack): movq %rcx, %rax
movq %rdx, %rcx
movq %r8, %rdx
- movq %r9, %rsp
-
#
# Reserve space for register parameters (rcx, rdx, r8 & r9) on the stack,
# in case the callee wishes to spill them.
#
- subq $40, %rsp // 32-byte shadow space plus alignment pad
-
+ lea -0x20(%r9), %rsp
call *%rax
diff --git a/UnixPkg/Library/UnixBdsLib/PlatformData.c b/UnixPkg/Library/UnixBdsLib/PlatformData.c index bbeeb81721..449ad52e16 100644 --- a/UnixPkg/Library/UnixBdsLib/PlatformData.c +++ b/UnixPkg/Library/UnixBdsLib/PlatformData.c @@ -30,7 +30,7 @@ UINT16 gPlatformBootTimeOutDefault = 10; //
// Platform specific keyboard device path
//
-UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 =
+UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath =
{
{
HARDWARE_DEVICE_PATH,
@@ -54,7 +54,7 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = gEndEntire
};
-UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {
+UNIX_PLATFORM_UGA_DEVICE_PATH gGopDevicePath = {
{
HARDWARE_DEVICE_PATH,
HW_VENDOR_DP,
@@ -71,8 +71,8 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = { (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
(UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)
},
- EFI_UNIX_UGA_GUID,
- 1
+ EFI_UNIX_GOP_GUID,
+ 0
},
gEndEntire
};
@@ -108,11 +108,11 @@ BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[] = { (CONSOLE_OUT | CONSOLE_IN)
},
{
- (EFI_DEVICE_PATH_PROTOCOL *) &gUgaDevicePath0,
+ (EFI_DEVICE_PATH_PROTOCOL *) &gUgaDevicePath,
(CONSOLE_OUT | CONSOLE_IN)
},
{
- (EFI_DEVICE_PATH_PROTOCOL *) &gUgaDevicePath1,
+ (EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath,
(CONSOLE_OUT | CONSOLE_IN)
},
{
|