Make EdkModulePkg pass Intel IPF compiler with /W4 /WX switches, solving warning #1419.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2338 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 64 insertions, 53 deletions

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c b/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c
index ce9b3aa547..5e6b3e3a8f 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/EbcExecute.c
@@ -134,20 +134,6 @@ VmWriteMem32 (
   IN UINT32     Data

   );

 

-EFI_STATUS

-VmWriteMemN (

-  IN VM_CONTEXT *VmPtr,

-  UINTN         Addr,

-  IN UINTN      Data

-  );

-

-EFI_STATUS

-VmWriteMem64 (

-  IN VM_CONTEXT *VmPtr,

-  UINTN         Addr,

-  IN UINT64     Data

-  );

-

 STATIC

 UINT16

 VmReadCode16 (

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c b/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c
index e38f5be730..cf683295ea 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c
@@ -41,16 +41,6 @@ typedef struct _EBC_IMAGE_LIST {
   EBC_THUNK_LIST          *ThunkList;

 } EBC_IMAGE_LIST;

 

-//

-// Function prototypes

-//

-EFI_STATUS

-EFIAPI

-InitializeEbcDriver (

-  IN EFI_HANDLE           ImageHandle,

-  IN EFI_SYSTEM_TABLE     *SystemTable

-  );

-

 STATIC

 EFI_STATUS

 EFIAPI

@@ -77,12 +67,14 @@ EbcGetVersion (
   IN OUT UINT64           *Version

   );

 

+STATIC

 EFI_STATUS

 EFIAPI

 InitializeEbcCallback (

   IN EFI_DEBUG_SUPPORT_PROTOCOL  *This

   );

 

+STATIC

 VOID

 EFIAPI

 CommonEbcExceptionHandler (

@@ -90,6 +82,7 @@ CommonEbcExceptionHandler (
   IN EFI_SYSTEM_CONTEXT   SystemContext

   );

 

+STATIC

 VOID

 EFIAPI

 EbcPeriodicNotifyFunction (

@@ -97,6 +90,7 @@ EbcPeriodicNotifyFunction (
   IN VOID          *Context

   );

 

+STATIC

 EFI_STATUS

 EFIAPI

 EbcDebugPeriodic (

@@ -646,6 +640,7 @@ Returns:
   return EFI_SUCCESS;

 }

 

+STATIC

 EFI_STATUS

 InitializeEbcCallback (

   IN EFI_DEBUG_SUPPORT_PROTOCOL  *This

@@ -707,6 +702,7 @@ Returns:
   return EFI_SUCCESS;

 }

 

+STATIC

 VOID

 CommonEbcExceptionHandler (

   IN EFI_EXCEPTION_TYPE   InterruptType,

@@ -739,6 +735,7 @@ Returns:
   return ;

 }

 

+STATIC

 VOID

 EFIAPI

 EbcPeriodicNotifyFunction (

@@ -774,7 +771,7 @@ Returns:
   return ;

 }

 

-

+STATIC

 EFI_STATUS

 EbcDebugPeriodic (

   IN VM_CONTEXT *VmPtr

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
index 279f4202b6..29ee55b864 100644
--- a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.c
@@ -22,34 +22,7 @@ Abstract:
 

 #include "EbcInt.h"

 #include "EbcExecute.h"

-

-#define VM_STACK_SIZE   (1024 * 32)

-

-#define EBC_THUNK_SIZE  128

-

-//

-// For code execution, thunks must be aligned on 16-byte boundary

-//

-#define EBC_THUNK_ALIGNMENT 16

-

-//

-// Opcodes for IPF instructions. We'll need to hand-create thunk code (stuffing

-// bits) to insert a jump to the interpreter.

-//

-#define OPCODE_NOP              (UINT64) 0x00008000000

-#define OPCODE_BR_COND_SPTK_FEW (UINT64) 0x00100000000

-#define OPCODE_MOV_BX_RX        (UINT64) 0x00E00100000

-

-//

-// Opcode for MOVL instruction

-//

-#define MOVL_OPCODE 0x06

-

-VOID

-EbcAsmLLCALLEX (

-  IN UINTN    CallAddr,

-  IN UINTN    EbcSp

-  );

+#include "EbcSupport.h"

 

 STATIC

 EFI_STATUS

diff --git a/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.h b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.h
new file mode 100644
index 0000000000..93c568edc1
--- /dev/null
+++ b/EdkModulePkg/Universal/Ebc/Dxe/Ipf/EbcSupport.h
@@ -0,0 +1,55 @@
+/*++

+

+Copyright (c) 2006, Intel Corporation

+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.

+

+Module Name:

+

+  EbcSupport.h

+

+Abstract:

+

+  Definition of EBC Support function

+

+Revision History

+

+--*/

+

+#ifndef _IPF_EBC_SUPPORT_H_

+#define _IPF_EBC_SUPPORT_H_

+

+#define VM_STACK_SIZE   (1024 * 32)

+

+#define EBC_THUNK_SIZE  128

+

+//

+// For code execution, thunks must be aligned on 16-byte boundary

+//

+#define EBC_THUNK_ALIGNMENT 16

+

+//

+// Opcodes for IPF instructions. We'll need to hand-create thunk code (stuffing

+// bits) to insert a jump to the interpreter.

+//

+#define OPCODE_NOP              (UINT64) 0x00008000000

+#define OPCODE_BR_COND_SPTK_FEW (UINT64) 0x00100000000

+#define OPCODE_MOV_BX_RX        (UINT64) 0x00E00100000

+

+//

+// Opcode for MOVL instruction

+//

+#define MOVL_OPCODE 0x06

+

+VOID

+EbcAsmLLCALLEX (

+  IN UINTN    CallAddr,

+  IN UINTN    EbcSp

+  );

+

+#endif