summaryrefslogtreecommitdiff
path: root/src/vendorcode
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2017-06-26 14:30:39 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2017-06-27 17:35:39 +0000
commit8d29dd12580add6fc7e87c9e935165da50cfc67b (patch)
tree7192c03ff3f2dc9d6bc48916dcdbf6eb0afc7d04 /src/vendorcode
parenta26dbbd9d066d4276b2d090654c73f7c589b3114 (diff)
downloadcoreboot-8d29dd12580add6fc7e87c9e935165da50cfc67b.tar.xz
vendorcode/amd: Unify Porting.h across all targets
This requires to also unify the calling convention for AGESA functions from AGESA_STATUS (*agesa_func)(UINT32 Func, UINT32 Data, VOID *ConfigPtr) to AGESA_STATUS (*agesa_func)(UINT32 Func, UINTN Data, VOID *ConfigPtr) On systems running 32bit x86 code this will not make a difference as UINTN is uintptr_t which is 32bit on these machines. Change-Id: I095ec2273c18a9fda11712654e290ebc41b27bd9 Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: https://review.coreboot.org/20380 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/vendorcode')
-rw-r--r--src/vendorcode/amd/agesa/common/Porting.h286
-rw-r--r--src/vendorcode/amd/agesa/f10/Dispatcher.h2
-rw-r--r--src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c2
-rw-r--r--src/vendorcode/amd/agesa/f12/Dispatcher.h2
-rw-r--r--src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c2
-rw-r--r--src/vendorcode/amd/agesa/f14/Dispatcher.h2
-rw-r--r--src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c2
-rw-r--r--src/vendorcode/amd/agesa/f15/Dispatcher.h2
-rw-r--r--src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c2
-rw-r--r--src/vendorcode/amd/agesa/f15tn/Dispatcher.h2
-rw-r--r--src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c2
-rw-r--r--src/vendorcode/amd/agesa/f16kb/Dispatcher.h2
-rw-r--r--src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c2
-rw-r--r--src/vendorcode/amd/include/Porting.h (renamed from src/vendorcode/amd/pi/00730F01/Porting.h)34
-rw-r--r--src/vendorcode/amd/pi/00630F01/Porting.h299
-rw-r--r--src/vendorcode/amd/pi/00660F01/Porting.h286
-rw-r--r--src/vendorcode/amd/pi/00670F00/Porting.h286
17 files changed, 27 insertions, 1188 deletions
diff --git a/src/vendorcode/amd/agesa/common/Porting.h b/src/vendorcode/amd/agesa/common/Porting.h
deleted file mode 100644
index 79d5b67079..0000000000
--- a/src/vendorcode/amd/agesa/common/Porting.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* $NoKeywords:$ */
-/**
- * @file
- *
- * Describes compiler dependencies - to support several compile time environments
- *
- * Contains compiler environment porting descriptions
- *
- * @xrefitem bom "File Content Label" "Release Content"
- * @e project: AGESA
- * @e sub-project: Includes
- * @e \$Revision: 44324 $ @e \$Date: 2010-12-22 03:16:51 -0600 (Wed, 22 Dec 2010) $
- */
-/*****************************************************************************
- *
- * Copyright (c) 2008 - 2012, Advanced Micro Devices, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Advanced Micro Devices, Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ***************************************************************************/
-
-#ifndef _PORTING_H_
-#define _PORTING_H_
-
-#if defined (_MSC_VER)
- #include <intrin.h>
- void _disable (void);
- void _enable (void);
- #pragma warning(disable: 4103 4001 4733)
- #pragma intrinsic (_disable, _enable)
- #pragma warning(push)
- // -----------------------------------------------------------------------
- // Define a code_seg MACRO
- //
- #define MAKE_AS_A_STRING(arg) #arg
-
- #define CODE_GROUP(arg) __pragma (code_seg (MAKE_AS_A_STRING (.t##arg)))
-
- #define RDATA_GROUP(arg) __pragma (const_seg (MAKE_AS_A_STRING (.d##arg)))
- #define FUNC_ATTRIBUTE(arg) __declspec(arg)
- //#include <intrin.h> // MS has built-in functions
-
- #if _MSC_VER < 900
- // -----------------------------------------------------------------------
- // Assume MSVC 1.52C (16-bit)
- //
- // NOTE: When using MSVC 1.52C use the following command line:
- //
- // CL.EXE /G3 /AL /O1i /Fa <FILENAME.C>
- //
- // This will produce 32-bit code in USE16 segment that is optimized for code
- // size.
- typedef void VOID;
-
- // Create the universal 32, 16, and 8-bit data types
- typedef unsigned long UINTN;
- typedef long INT32;
- typedef unsigned long UINT32;
- typedef int INT16;
- typedef unsigned int UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- /// struct for 16-bit environment handling of 64-bit value
- typedef struct _UINT64 {
- IN OUT UINT32 lo; ///< lower 32-bits of 64-bit value
- IN OUT UINT32 hi; ///< highest 32-bits of 64-bit value
- } UINT64;
-
- // Create the Boolean type
- #define TRUE 1
- #define FALSE 0
- typedef unsigned char BOOLEAN;
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV __pascal
- #define ROMDATA __based( __segname( "_CODE" ) )
- #define _16BYTE_ALIGN __declspec(align(16))
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma warning( disable : 4103 ) // Disable '#pragma pack' in .h warning
- #pragma pack(1)
-
- // Disable WORD->BYTE automatic conversion warnings. Example:
- // BYTE LocalByte;
- // void MyFunc(BYTE val);
- //
- // MyFunc(LocalByte*2+1); // Warning, automatic conversion
- //
- // The problem is any time math is performed on a BYTE, it is converted to a
- // WORD by MSVC 1.52c, and then when it is converted back to a BYTE, a warning
- // is generated. Disable warning C4761
- #pragma warning( disable : 4761 )
-
- #else
- // -----------------------------------------------------------------------
- // Assume a 32-bit MSVC++
- //
- // Disable the following warnings:
- // 4100 - 'identifier' : unreferenced formal parameter
- // 4276 - 'function' : no prototype provided; assumed no parameters
- // 4214 - non standard extension used : bit field types other than int
- // 4001 - nonstandard extension 'single line comment' was used
- // 4142 - benign redefinition of type for following declaration
- // - typedef char INT8
- #if defined (_M_IX86)
- #pragma warning (disable: 4100 4276 4214 4001 4142 4305 4306)
-
- #ifndef VOID
- typedef void VOID;
- #endif
- // Create the universal 32, 16, and 8-bit data types
- #ifndef UINTN
- typedef unsigned __w64 UINTN;
- #endif
- typedef __int64 INT64;
- typedef unsigned __int64 UINT64;
- typedef int INT32;
- typedef unsigned int UINT32;
- typedef short INT16;
- typedef unsigned short UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- // Create the Boolean type
- #ifndef TRUE
- #define TRUE 1
- #endif
- #ifndef FALSE
- #define FALSE 0
- #endif
- typedef unsigned char BOOLEAN;
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma pack(1)
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV
- #define ROMDATA
- #define _16BYTE_ALIGN __declspec(align(64))
- // 64 bit of compiler
- #else
- #pragma warning (disable: 4100 4276 4214 4001 4142 4305 4306 4366)
-
- #ifndef VOID
- typedef void VOID;
- #endif
- // Create the universal 32, 16, and 8-bit data types
- #ifndef UINTN
- typedef unsigned __int64 UINTN;
- #endif
- typedef __int64 INT64;
- typedef unsigned __int64 UINT64;
- typedef int INT32;
- typedef unsigned int UINT32;
- typedef short INT16;
- typedef unsigned short UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- // Create the Boolean type
- #ifndef TRUE
- #define TRUE 1
- #endif
- #ifndef FALSE
- #define FALSE 0
- #endif
- typedef unsigned char BOOLEAN;
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma pack(1)
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV
- #define ROMDATA
- #endif
- #endif
- // -----------------------------------------------------------------------
- // End of MS compiler versions
-
-#elif defined __GNUC__
-
- #include <stdint.h>
- #define IN
- #define OUT
- #define STATIC static
- #define VOLATILE volatile
- #define TRUE 1
- #define FALSE 0
-// #undef CONST
- #define CONST const
- #define ROMDATA
- #define CALLCONV
- #define _16BYTE_ALIGN __attribute__ ((aligned (16)))
-
-
- // Create the universal 32, 16, and 8-bit data types
- typedef unsigned char BOOLEAN;
- typedef uintptr_t UINTN;
- typedef int64_t INT64;
- typedef uint64_t UINT64;
- typedef int32_t INT32;
- typedef uint32_t UINT32;
- typedef int16_t INT16;
- typedef uint16_t UINT16;
- typedef int8_t INT8;
- typedef uint8_t UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
- typedef void VOID;
- //typedef unsigned long size_t;
-
- //#include <intrin.h> // MingW-w64 library header
-#pragma pack(1)
-
-#define CODE_GROUP(arg)
-#define RDATA_GROUP(arg)
-
-#define FUNC_ATTRIBUTE(arg) __attribute__((arg))
-#define MAKE_AS_A_STRING(arg) #arg
-#include <stddef.h>
-#include <gcc-intrin.h>
-
-#include <assert.h>
-#include <console/console.h>
-#include <commonlib/loglevel.h>
-
-#ifndef NULL
- #define NULL (void *)0
-#endif
-
-#else
- // -----------------------------------------------------------------------
- // Unknown or unsupported compiler
- //
- #error "Unknown compiler in use"
-#endif
-
-// -----------------------------------------------------------------------
-// Common definitions for all compilers
-//
-
-//Support forward reference construct
-#define AGESA_FORWARD_DECLARATION(x) typedef struct _##x x
-
-// The following are use in conformance to the UEFI style guide
-#define IN
-#define OUT
-
-#endif // _PORTING_H_
diff --git a/src/vendorcode/amd/agesa/f10/Dispatcher.h b/src/vendorcode/amd/agesa/f10/Dispatcher.h
index f92e1ad452..5e03a30498 100644
--- a/src/vendorcode/amd/agesa/f10/Dispatcher.h
+++ b/src/vendorcode/amd/agesa/f10/Dispatcher.h
@@ -46,6 +46,6 @@
// AGESA function prototypes
AGESA_STATUS CALLCONV AmdAgesaDispatcher ( IN OUT VOID *ConfigPtr );
-AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINT32 Data, IN OUT VOID *ConfigPtr );
+AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINTN Data, IN OUT VOID *ConfigPtr );
#endif // _DISPATCHER_H_
diff --git a/src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c
index 4fc75b7eb1..499e8e4e9c 100644
--- a/src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f10/Legacy/Proc/Dispatcher.c
@@ -117,7 +117,7 @@ AGESA_STATUS
CALLCONV
AmdAgesaCallout (
IN UINT32 Func,
- IN UINT32 Data,
+ IN UINTN Data,
IN OUT VOID *ConfigPtr
)
{
diff --git a/src/vendorcode/amd/agesa/f12/Dispatcher.h b/src/vendorcode/amd/agesa/f12/Dispatcher.h
index 689ffd14a0..baa69cde26 100644
--- a/src/vendorcode/amd/agesa/f12/Dispatcher.h
+++ b/src/vendorcode/amd/agesa/f12/Dispatcher.h
@@ -46,6 +46,6 @@
// AGESA function prototypes
AGESA_STATUS CALLCONV AmdAgesaDispatcher ( IN OUT VOID *ConfigPtr );
-AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINT32 Data, IN OUT VOID *ConfigPtr );
+AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINTN Data, IN OUT VOID *ConfigPtr );
#endif // _DISPATCHER_H_
diff --git a/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c
index f5cc0362db..b507570e48 100644
--- a/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f12/Legacy/Proc/Dispatcher.c
@@ -120,7 +120,7 @@ AGESA_STATUS
CALLCONV
AmdAgesaCallout (
IN UINT32 Func,
- IN UINT32 Data,
+ IN UINTN Data,
IN OUT VOID *ConfigPtr
)
{
diff --git a/src/vendorcode/amd/agesa/f14/Dispatcher.h b/src/vendorcode/amd/agesa/f14/Dispatcher.h
index 55bb2b2de5..b4ebeaf62f 100644
--- a/src/vendorcode/amd/agesa/f14/Dispatcher.h
+++ b/src/vendorcode/amd/agesa/f14/Dispatcher.h
@@ -49,6 +49,6 @@
// AGESA function prototypes
AGESA_STATUS CALLCONV AmdAgesaDispatcher ( IN OUT VOID *ConfigPtr );
-AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINT32 Data, IN OUT VOID *ConfigPtr );
+AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINTN Data, IN OUT VOID *ConfigPtr );
#endif // _DISPATCHER_H_
diff --git a/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
index ec95fa3cd2..ea9c6da4cc 100644
--- a/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f14/Legacy/Proc/Dispatcher.c
@@ -123,7 +123,7 @@ AGESA_STATUS
CALLCONV
AmdAgesaCallout (
IN UINT32 Func,
- IN UINT32 Data,
+ IN UINTN Data,
IN OUT VOID *ConfigPtr
)
{
diff --git a/src/vendorcode/amd/agesa/f15/Dispatcher.h b/src/vendorcode/amd/agesa/f15/Dispatcher.h
index 1ee8569228..a17757b1cc 100644
--- a/src/vendorcode/amd/agesa/f15/Dispatcher.h
+++ b/src/vendorcode/amd/agesa/f15/Dispatcher.h
@@ -45,6 +45,6 @@
// AGESA function prototypes
AGESA_STATUS CALLCONV AmdAgesaDispatcher ( IN OUT VOID *ConfigPtr );
-AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINT32 Data, IN OUT VOID *ConfigPtr );
+AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINTN Data, IN OUT VOID *ConfigPtr );
#endif // _DISPATCHER_H_
diff --git a/src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c
index 149f1fef20..7d570679f1 100644
--- a/src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f15/Legacy/Proc/Dispatcher.c
@@ -121,7 +121,7 @@ AGESA_STATUS
CALLCONV
AmdAgesaCallout (
IN UINT32 Func,
- IN UINT32 Data,
+ IN UINTN Data,
IN OUT VOID *ConfigPtr
)
{
diff --git a/src/vendorcode/amd/agesa/f15tn/Dispatcher.h b/src/vendorcode/amd/agesa/f15tn/Dispatcher.h
index 88758e98a9..3f98e8cc98 100644
--- a/src/vendorcode/amd/agesa/f15tn/Dispatcher.h
+++ b/src/vendorcode/amd/agesa/f15tn/Dispatcher.h
@@ -46,6 +46,6 @@
// AGESA function prototypes
AGESA_STATUS CALLCONV AmdAgesaDispatcher ( IN OUT VOID *ConfigPtr );
-AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINT32 Data, IN OUT VOID *ConfigPtr );
+AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINTN Data, IN OUT VOID *ConfigPtr );
#endif // _DISPATCHER_H_
diff --git a/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c
index 59209fe4e5..c33d09ce06 100644
--- a/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f15tn/Legacy/Proc/Dispatcher.c
@@ -120,7 +120,7 @@ AGESA_STATUS
CALLCONV
AmdAgesaCallout (
IN UINT32 Func,
- IN UINT32 Data,
+ IN UINTN Data,
IN OUT VOID *ConfigPtr
)
{
diff --git a/src/vendorcode/amd/agesa/f16kb/Dispatcher.h b/src/vendorcode/amd/agesa/f16kb/Dispatcher.h
index eecdd0eebf..350e5f41e0 100644
--- a/src/vendorcode/amd/agesa/f16kb/Dispatcher.h
+++ b/src/vendorcode/amd/agesa/f16kb/Dispatcher.h
@@ -46,6 +46,6 @@
// AGESA function prototypes
AGESA_STATUS CALLCONV AmdAgesaDispatcher ( IN OUT VOID *ConfigPtr );
-AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINT32 Data, IN OUT VOID *ConfigPtr );
+AGESA_STATUS CALLCONV AmdAgesaCallout ( IN UINT32 Func, IN UINTN Data, IN OUT VOID *ConfigPtr );
#endif // _DISPATCHER_H_
diff --git a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c
index 067fabd44a..a721c7fa94 100644
--- a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c
+++ b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Dispatcher.c
@@ -120,7 +120,7 @@ AGESA_STATUS
CALLCONV
AmdAgesaCallout (
IN UINT32 Func,
- IN UINT32 Data,
+ IN UINTN Data,
IN OUT VOID *ConfigPtr
)
{
diff --git a/src/vendorcode/amd/pi/00730F01/Porting.h b/src/vendorcode/amd/include/Porting.h
index e7cb89cda9..ee0f074d3a 100644
--- a/src/vendorcode/amd/pi/00730F01/Porting.h
+++ b/src/vendorcode/amd/include/Porting.h
@@ -232,13 +232,14 @@
#elif defined __GNUC__
+ #include <stdint.h>
+
#define IN
#define OUT
#define STATIC static
#define VOLATILE volatile
#define TRUE 1
#define FALSE 0
-// #undef CONST
#define CONST const
#define ROMDATA
#define CALLCONV
@@ -248,28 +249,23 @@
#define _2BYTE_ALIGN __attribute__ ((aligned (2)))
#define _1BYTE_ALIGN __attribute__ ((aligned (1)))
+ typedef uintptr_t UINTN;
+ typedef int64_t INT64;
+ typedef uint64_t UINT64;
+ typedef int32_t INT32;
+ typedef uint32_t UINT32;
+ typedef int16_t INT16;
+ typedef uint16_t UINT16;
+ typedef int8_t INT8;
+ typedef uint8_t UINT8;
+ typedef char CHAR8;
+ typedef unsigned short CHAR16;
typedef unsigned char BOOLEAN;
- typedef signed char INT8;
- typedef signed short INT16;
- typedef signed long INT32;
- typedef signed long long INT64;
- typedef char CHAR8;
- typedef unsigned char UINT8;
- typedef unsigned short UINT16;
- typedef unsigned long UINT32;
- typedef unsigned long UINTN;
- typedef unsigned long long UINT64;
typedef void VOID;
- //typedef unsigned long size_t;
- //typedef unsigned int uintptr_t;
- //#include <intrin.h> // MingW-w64 library header
#define CODE_GROUP(arg)
#define RDATA_GROUP(arg)
- //#include <intrin.h> // MingW-w64 library header
- //#include <MyIntrinsics.h> // AGESA temp file for GCC until support is added to MinGW
-
#pragma pack(1)
#define FUNC_ATTRIBUTE(arg) __attribute__((arg))
@@ -278,8 +274,8 @@
#include <gcc-intrin.h>
#include <assert.h>
-#include <console/console.h>
-#include <commonlib/loglevel.h>
+//#include <console/console.h>
+//#include <commonlib/loglevel.h>
#ifndef NULL
#define NULL ((void *)0)
diff --git a/src/vendorcode/amd/pi/00630F01/Porting.h b/src/vendorcode/amd/pi/00630F01/Porting.h
deleted file mode 100644
index 10346aeefd..0000000000
--- a/src/vendorcode/amd/pi/00630F01/Porting.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* $NoKeywords:$ */
-/**
- * @file
- *
- * Describes compiler dependencies - to support several compile time environments
- *
- * Contains compiler environment porting descriptions
- *
- * @xrefitem bom "File Content Label" "Release Content"
- * @e project: AGESA
- * @e sub-project: Includes
- * @e \$Revision: 44324 $ @e \$Date: 2010-12-22 03:16:51 -0600 (Wed, 22 Dec 2010) $
- */
-/*****************************************************************************
- *
- * Copyright (c) 2008 - 2013, Advanced Micro Devices, Inc.
- * 2013 - 2014, Sage Electronic Engineering, LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Advanced Micro Devices, Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ***************************************************************************/
-
-#ifndef _PORTING_H_
-#define _PORTING_H_
-
-#if defined (_MSC_VER)
- #pragma warning(push)
- #pragma warning(disable: 4103 4001 4733)
- // -----------------------------------------------------------------------
- // Define a code_seg MACRO
- //
- #define MAKE_AS_A_STRING(arg) #arg
-
- #define CODE_GROUP(arg) __pragma (code_seg (MAKE_AS_A_STRING (.t##arg)))
-
- #define RDATA_GROUP(arg) __pragma (const_seg (MAKE_AS_A_STRING (.d##arg)))
- #define FUNC_ATTRIBUTE(arg) __declspec(arg)
- //#include <intrin.h> // MS has built-in functions
-
- #if _MSC_VER < 900
- // -----------------------------------------------------------------------
- // Assume MSVC 1.52C (16-bit)
- //
- // NOTE: When using MSVC 1.52C use the following command line:
- //
- // CL.EXE /G3 /AL /O1i /Fa <FILENAME.C>
- //
- // This will produce 32-bit code in USE16 segment that is optimized for code
- // size.
- typedef void VOID;
-
- // Create the universal 32, 16, and 8-bit data types
- typedef unsigned long UINTN;
- typedef long INT32;
- typedef unsigned long UINT32;
- typedef int INT16;
- typedef unsigned int UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- /// struct for 16-bit environment handling of 64-bit value
- typedef struct _UINT64 {
- IN OUT UINT32 lo; ///< lower 32-bits of 64-bit value
- IN OUT UINT32 hi; ///< highest 32-bits of 64-bit value
- } UINT64;
-
- // Create the Boolean type
- #define TRUE 1
- #define FALSE 0
- typedef unsigned char BOOLEAN;
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV __pascal
- #define ROMDATA __based( __segname( "_CODE" ) )
- #define _16BYTE_ALIGN __declspec(align(16))
- #define _8BYTE_ALIGN
- #define _4BYTE_ALIGN
- #define _2BYTE_ALIGN
- #define _1BYTE_ALIGN
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma warning( disable : 4103 ) // Disable '#pragma pack' in .h warning
- #pragma pack(1)
-
- // Disable WORD->BYTE automatic conversion warnings. Example:
- // BYTE LocalByte;
- // void MyFunc(BYTE val);
- //
- // MyFunc(LocalByte*2+1); // Warning, automatic conversion
- //
- // The problem is any time math is performed on a BYTE, it is converted to a
- // WORD by MSVC 1.52c, and then when it is converted back to a BYTE, a warning
- // is generated. Disable warning C4761
- #pragma warning( disable : 4761 )
-
- #else
- // -----------------------------------------------------------------------
- // Assume a 32-bit MSVC++
- //
- // Disable the following warnings:
- // 4100 - 'identifier' : unreferenced formal parameter
- // 4276 - 'function' : no prototype provided; assumed no parameters
- // 4214 - non standard extension used : bit field types other than int
- // 4001 - nonstandard extension 'single line comment' was used
- // 4142 - benign redefinition of type for following declaration
- // - typedef char INT8
- #if defined (_M_IX86)
- #pragma warning (disable: 4100 4276 4214 4001 4142 4305 4306)
-
- #ifndef VOID
- typedef void VOID;
- #endif
- // Create the universal 32, 16, and 8-bit data types
- #ifndef UINTN
- typedef unsigned __w64 UINTN;
- #endif
- typedef __int64 INT64;
- typedef unsigned __int64 UINT64;
- typedef int INT32;
- typedef unsigned int UINT32;
- typedef short INT16;
- typedef unsigned short UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- // Create the Boolean type
- #ifndef TRUE
- #define TRUE 1
- #endif
- #ifndef FALSE
- #define FALSE 0
- #endif
- typedef unsigned char BOOLEAN;
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma pack(1)
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV
- #define ROMDATA
- #define _16BYTE_ALIGN __declspec(align(64))
- #define _8BYTE_ALIGN
- #define _4BYTE_ALIGN
- #define _2BYTE_ALIGN
- #define _1BYTE_ALIGN
- #if _MSC_VER >= 1400
- #define VA_ARGS_SUPPORTED
- #endif
- // 64 bit of compiler
- #else
- #pragma warning (disable: 4100 4276 4214 4001 4142 4305 4306 4366)
-
- #ifndef VOID
- typedef void VOID;
- #endif
- // Create the universal 32, 16, and 8-bit data types
- #ifndef UINTN
- typedef unsigned __int64 UINTN;
- #endif
- typedef __int64 INT64;
- typedef unsigned __int64 UINT64;
- typedef int INT32;
- typedef unsigned int UINT32;
- typedef short INT16;
- typedef unsigned short UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- // Create the Boolean type
- #ifndef TRUE
- #define TRUE 1
- #endif
- #ifndef FALSE
- #define FALSE 0
- #endif
- typedef unsigned char BOOLEAN;
- #define _8BYTE_ALIGN
- #define _4BYTE_ALIGN
- #define _2BYTE_ALIGN
- #define _1BYTE_ALIGN
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma pack(1)
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV
- #define ROMDATA
- #endif
- #endif
- // -----------------------------------------------------------------------
- // End of MS compiler versions
-
-#elif defined __GNUC__
-
- #define IN
- #define OUT
- #define STATIC static
- #define VOLATILE volatile
- #define TRUE 1
- #define FALSE 0
-// #undef CONST
- #define CONST const
- #define ROMDATA
- #define CALLCONV
- #define _16BYTE_ALIGN __attribute__ ((aligned (16)))
- #define _8BYTE_ALIGN __attribute__ ((aligned (8)))
- #define _4BYTE_ALIGN __attribute__ ((aligned (4)))
- #define _2BYTE_ALIGN __attribute__ ((aligned (2)))
- #define _1BYTE_ALIGN __attribute__ ((aligned (1)))
-
- typedef unsigned char BOOLEAN;
- typedef signed char INT8;
- typedef signed short INT16;
- typedef signed long INT32;
- typedef signed long long INT64;
- typedef char CHAR8;
- typedef unsigned char UINT8;
- typedef unsigned short UINT16;
- typedef unsigned long UINT32;
- typedef unsigned long UINTN;
- typedef unsigned long long UINT64;
- typedef void VOID;
- //typedef unsigned long size_t;
- //typedef unsigned int uintptr_t;
- #define CODE_GROUP(arg)
- #define RDATA_GROUP(arg)
-
- //#include <intrin.h> // MingW-w64 library header
- //#include <MyIntrinsics.h> // AGESA temp file for GCC until support is added to MinGW
-
-#pragma pack(1)
-
-#define FUNC_ATTRIBUTE(arg) __attribute__((arg))
-#define MAKE_AS_A_STRING(arg) #arg
-#include <stddef.h>
-#include <gcc-intrin.h>
-
-#include <assert.h>
-#include <console/console.h>
-#include <commonlib/loglevel.h>
-
-#ifndef NULL
- #define NULL ((void *)0)
-#endif
-
-#else
- // -----------------------------------------------------------------------
- // Unknown or unsupported compiler
- //
- #error "Unknown compiler in use"
-#endif
-
-// -----------------------------------------------------------------------
-// Common definitions for all compilers
-//
-
-//Support forward reference construct
-#define AGESA_FORWARD_DECLARATION(x) typedef struct _##x x
-
-// The following are use in conformance to the UEFI style guide
-#define IN
-#define OUT
-
-#endif // _PORTING_H_
diff --git a/src/vendorcode/amd/pi/00660F01/Porting.h b/src/vendorcode/amd/pi/00660F01/Porting.h
deleted file mode 100644
index ceae0c0e4e..0000000000
--- a/src/vendorcode/amd/pi/00660F01/Porting.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* $NoKeywords:$ */
-/**
- * @file
- *
- * Describes compiler dependencies - to support several compile time environments
- *
- * Contains compiler environment porting descriptions
- *
- * @xrefitem bom "File Content Label" "Release Content"
- * @e project: AGESA
- * @e sub-project: Includes
- * @e \$Revision: 309090 $ @e \$Date: 2014-12-09 12:28:05 -0600 (Tue, 09 Dec 2014) $
- */
-/*****************************************************************************
- *
- * Copyright 2008 - 2015 ADVANCED MICRO DEVICES, INC. All Rights Reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Advanced Micro Devices, Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ***************************************************************************/
-
-#ifndef _PORTING_H_
-#define _PORTING_H_
-
-#if defined (_MSC_VER)
- #include <intrin.h>
- void _disable (void);
- void _enable (void);
- #pragma warning(disable: 4103 4001 4733)
- #pragma intrinsic (_disable, _enable)
- #pragma warning(push)
- // -----------------------------------------------------------------------
- // Define a code_seg MACRO
- //
- #define MAKE_AS_A_STRING(arg) #arg
-
- #define CODE_GROUP(arg) __pragma (code_seg (MAKE_AS_A_STRING (.t##arg)))
-
- #define RDATA_GROUP(arg) __pragma (const_seg (MAKE_AS_A_STRING (.d##arg)))
- #define FUNC_ATTRIBUTE(arg) __declspec(arg)
- //#include <intrin.h> // MS has built-in functions
-
- #if _MSC_VER < 900
- // -----------------------------------------------------------------------
- // Assume MSVC 1.52C (16-bit)
- //
- // NOTE: When using MSVC 1.52C use the following command line:
- //
- // CL.EXE /G3 /AL /O1i /Fa <FILENAME.C>
- //
- // This will produce 32-bit code in USE16 segment that is optimized for code
- // size.
- typedef void VOID;
-
- // Create the universal 32, 16, and 8-bit data types
- typedef unsigned long UINTN;
- typedef long INT32;
- typedef unsigned long UINT32;
- typedef int INT16;
- typedef unsigned int UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- /// struct for 16-bit environment handling of 64-bit value
- typedef struct _UINT64 {
- IN OUT UINT32 lo; ///< lower 32-bits of 64-bit value
- IN OUT UINT32 hi; ///< highest 32-bits of 64-bit value
- } UINT64;
-
- // Create the Boolean type
- #define TRUE 1
- #define FALSE 0
- typedef unsigned char BOOLEAN;
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV __pascal
- #define ROMDATA __based( __segname( "_CODE" ) )
- #define _16BYTE_ALIGN __declspec(align(16))
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma warning( disable : 4103 ) // Disable '#pragma pack' in .h warning
- #pragma pack(1)
-
- // Disable WORD->BYTE automatic conversion warnings. Example:
- // BYTE LocalByte;
- // void MyFunc(BYTE val);
- //
- // MyFunc(LocalByte*2+1); // Warning, automatic conversion
- //
- // The problem is any time math is performed on a BYTE, it is converted to a
- // WORD by MSVC 1.52c, and then when it is converted back to a BYTE, a warning
- // is generated. Disable warning C4761
- #pragma warning( disable : 4761 )
-
- #else
- // -----------------------------------------------------------------------
- // Assume a 32-bit MSVC++
- //
- // Disable the following warnings:
- // 4100 - 'identifier' : unreferenced formal parameter
- // 4276 - 'function' : no prototype provided; assumed no parameters
- // 4214 - non standard extension used : bit field types other than int
- // 4001 - nonstandard extension 'single line comment' was used
- // 4142 - benign redefinition of type for following declaration
- // - typedef char INT8
- #if defined (_M_IX86)
- #pragma warning (disable: 4100 4276 4214 4001 4142 4305 4306)
-
- #ifndef VOID
- typedef void VOID;
- #endif
- // Create the universal 32, 16, and 8-bit data types
- #ifndef UINTN
- typedef unsigned __w64 UINTN;
- #endif
- typedef __int64 INT64;
- typedef unsigned __int64 UINT64;
- typedef int INT32;
- typedef unsigned int UINT32;
- typedef short INT16;
- typedef unsigned short UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- // Create the Boolean type
- #ifndef TRUE
- #define TRUE 1
- #endif
- #ifndef FALSE
- #define FALSE 0
- #endif
- typedef unsigned char BOOLEAN;
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma pack(1)
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV
- #define ROMDATA
- #define _16BYTE_ALIGN __declspec(align(64))
- // 64 bit of compiler
- #else
- #pragma warning (disable: 4100 4276 4214 4001 4142 4305 4306 4366)
-
- #ifndef VOID
- typedef void VOID;
- #endif
- // Create the universal 32, 16, and 8-bit data types
- #ifndef UINTN
- typedef unsigned __int64 UINTN;
- #endif
- typedef __int64 INT64;
- typedef unsigned __int64 UINT64;
- typedef int INT32;
- typedef unsigned int UINT32;
- typedef short INT16;
- typedef unsigned short UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- // Create the Boolean type
- #ifndef TRUE
- #define TRUE 1
- #endif
- #ifndef FALSE
- #define FALSE 0
- #endif
- typedef unsigned char BOOLEAN;
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma pack(1)
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV
- #define ROMDATA
- #endif
- #endif
- // -----------------------------------------------------------------------
- // End of MS compiler versions
-
-#elif defined __GNUC__
-
- #define IN
- #define OUT
- #define STATIC static
- #define VOLATILE volatile
- #define TRUE 1
- #define FALSE 0
-// #undef CONST
- #define CONST const
- #define ROMDATA
- #define CALLCONV
- #define _16BYTE_ALIGN __attribute__ ((aligned (16)))
- #define _8BYTE_ALIGN __attribute__ ((aligned (8)))
- #define _4BYTE_ALIGN __attribute__ ((aligned (4)))
- #define _2BYTE_ALIGN __attribute__ ((aligned (2)))
- #define _1BYTE_ALIGN __attribute__ ((aligned (1)))
-
- typedef unsigned char BOOLEAN;
- typedef signed char INT8;
- typedef signed short INT16;
- typedef signed long INT32;
- typedef char CHAR8;
- typedef unsigned char UINT8;
- typedef unsigned short UINT16;
- typedef unsigned long UINT32;
- typedef unsigned long UINTN;
- typedef unsigned long long UINT64;
- typedef long long INT64;
- typedef void VOID;
- //typedef unsigned long size_t;
-
- //#include <intrin.h> // MingW-w64 library header
-#pragma pack(1)
-
-#define CODE_GROUP(arg)
-#define RDATA_GROUP(arg)
-
-#define FUNC_ATTRIBUTE(arg) __attribute__((arg))
-#define MAKE_AS_A_STRING(arg) #arg
-#include <stddef.h>
-#include <gcc-intrin.h>
-
-#include <assert.h>
-#include <console/console.h>
-#include <commonlib/loglevel.h>
-
-#ifndef NULL
- #define NULL (void *)0
-#endif
-
-#else
- // -----------------------------------------------------------------------
- // Unknown or unsupported compiler
- //
- #error "Unknown compiler in use"
-#endif
-
-// -----------------------------------------------------------------------
-// Common definitions for all compilers
-//
-
-//Support forward reference construct
-#define AGESA_FORWARD_DECLARATION(x) typedef struct _##x x
-
-// The following are use in conformance to the UEFI style guide
-#define IN
-#define OUT
-
-#endif // _PORTING_H_
diff --git a/src/vendorcode/amd/pi/00670F00/Porting.h b/src/vendorcode/amd/pi/00670F00/Porting.h
deleted file mode 100644
index ceae0c0e4e..0000000000
--- a/src/vendorcode/amd/pi/00670F00/Porting.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* $NoKeywords:$ */
-/**
- * @file
- *
- * Describes compiler dependencies - to support several compile time environments
- *
- * Contains compiler environment porting descriptions
- *
- * @xrefitem bom "File Content Label" "Release Content"
- * @e project: AGESA
- * @e sub-project: Includes
- * @e \$Revision: 309090 $ @e \$Date: 2014-12-09 12:28:05 -0600 (Tue, 09 Dec 2014) $
- */
-/*****************************************************************************
- *
- * Copyright 2008 - 2015 ADVANCED MICRO DEVICES, INC. All Rights Reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Advanced Micro Devices, Inc. nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ***************************************************************************/
-
-#ifndef _PORTING_H_
-#define _PORTING_H_
-
-#if defined (_MSC_VER)
- #include <intrin.h>
- void _disable (void);
- void _enable (void);
- #pragma warning(disable: 4103 4001 4733)
- #pragma intrinsic (_disable, _enable)
- #pragma warning(push)
- // -----------------------------------------------------------------------
- // Define a code_seg MACRO
- //
- #define MAKE_AS_A_STRING(arg) #arg
-
- #define CODE_GROUP(arg) __pragma (code_seg (MAKE_AS_A_STRING (.t##arg)))
-
- #define RDATA_GROUP(arg) __pragma (const_seg (MAKE_AS_A_STRING (.d##arg)))
- #define FUNC_ATTRIBUTE(arg) __declspec(arg)
- //#include <intrin.h> // MS has built-in functions
-
- #if _MSC_VER < 900
- // -----------------------------------------------------------------------
- // Assume MSVC 1.52C (16-bit)
- //
- // NOTE: When using MSVC 1.52C use the following command line:
- //
- // CL.EXE /G3 /AL /O1i /Fa <FILENAME.C>
- //
- // This will produce 32-bit code in USE16 segment that is optimized for code
- // size.
- typedef void VOID;
-
- // Create the universal 32, 16, and 8-bit data types
- typedef unsigned long UINTN;
- typedef long INT32;
- typedef unsigned long UINT32;
- typedef int INT16;
- typedef unsigned int UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- /// struct for 16-bit environment handling of 64-bit value
- typedef struct _UINT64 {
- IN OUT UINT32 lo; ///< lower 32-bits of 64-bit value
- IN OUT UINT32 hi; ///< highest 32-bits of 64-bit value
- } UINT64;
-
- // Create the Boolean type
- #define TRUE 1
- #define FALSE 0
- typedef unsigned char BOOLEAN;
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV __pascal
- #define ROMDATA __based( __segname( "_CODE" ) )
- #define _16BYTE_ALIGN __declspec(align(16))
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma warning( disable : 4103 ) // Disable '#pragma pack' in .h warning
- #pragma pack(1)
-
- // Disable WORD->BYTE automatic conversion warnings. Example:
- // BYTE LocalByte;
- // void MyFunc(BYTE val);
- //
- // MyFunc(LocalByte*2+1); // Warning, automatic conversion
- //
- // The problem is any time math is performed on a BYTE, it is converted to a
- // WORD by MSVC 1.52c, and then when it is converted back to a BYTE, a warning
- // is generated. Disable warning C4761
- #pragma warning( disable : 4761 )
-
- #else
- // -----------------------------------------------------------------------
- // Assume a 32-bit MSVC++
- //
- // Disable the following warnings:
- // 4100 - 'identifier' : unreferenced formal parameter
- // 4276 - 'function' : no prototype provided; assumed no parameters
- // 4214 - non standard extension used : bit field types other than int
- // 4001 - nonstandard extension 'single line comment' was used
- // 4142 - benign redefinition of type for following declaration
- // - typedef char INT8
- #if defined (_M_IX86)
- #pragma warning (disable: 4100 4276 4214 4001 4142 4305 4306)
-
- #ifndef VOID
- typedef void VOID;
- #endif
- // Create the universal 32, 16, and 8-bit data types
- #ifndef UINTN
- typedef unsigned __w64 UINTN;
- #endif
- typedef __int64 INT64;
- typedef unsigned __int64 UINT64;
- typedef int INT32;
- typedef unsigned int UINT32;
- typedef short INT16;
- typedef unsigned short UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- // Create the Boolean type
- #ifndef TRUE
- #define TRUE 1
- #endif
- #ifndef FALSE
- #define FALSE 0
- #endif
- typedef unsigned char BOOLEAN;
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma pack(1)
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV
- #define ROMDATA
- #define _16BYTE_ALIGN __declspec(align(64))
- // 64 bit of compiler
- #else
- #pragma warning (disable: 4100 4276 4214 4001 4142 4305 4306 4366)
-
- #ifndef VOID
- typedef void VOID;
- #endif
- // Create the universal 32, 16, and 8-bit data types
- #ifndef UINTN
- typedef unsigned __int64 UINTN;
- #endif
- typedef __int64 INT64;
- typedef unsigned __int64 UINT64;
- typedef int INT32;
- typedef unsigned int UINT32;
- typedef short INT16;
- typedef unsigned short UINT16;
- typedef char INT8;
- typedef unsigned char UINT8;
- typedef char CHAR8;
- typedef unsigned short CHAR16;
-
- // Create the Boolean type
- #ifndef TRUE
- #define TRUE 1
- #endif
- #ifndef FALSE
- #define FALSE 0
- #endif
- typedef unsigned char BOOLEAN;
-
- // Force tight packing of structures
- // Note: Entire AGESA (Project / Solution) will be using pragma pack 1
- #pragma pack(1)
-
- #define CONST const
- #define STATIC static
- #define VOLATILE volatile
- #define CALLCONV
- #define ROMDATA
- #endif
- #endif
- // -----------------------------------------------------------------------
- // End of MS compiler versions
-
-#elif defined __GNUC__
-
- #define IN
- #define OUT
- #define STATIC static
- #define VOLATILE volatile
- #define TRUE 1
- #define FALSE 0
-// #undef CONST
- #define CONST const
- #define ROMDATA
- #define CALLCONV
- #define _16BYTE_ALIGN __attribute__ ((aligned (16)))
- #define _8BYTE_ALIGN __attribute__ ((aligned (8)))
- #define _4BYTE_ALIGN __attribute__ ((aligned (4)))
- #define _2BYTE_ALIGN __attribute__ ((aligned (2)))
- #define _1BYTE_ALIGN __attribute__ ((aligned (1)))
-
- typedef unsigned char BOOLEAN;
- typedef signed char INT8;
- typedef signed short INT16;
- typedef signed long INT32;
- typedef char CHAR8;
- typedef unsigned char UINT8;
- typedef unsigned short UINT16;
- typedef unsigned long UINT32;
- typedef unsigned long UINTN;
- typedef unsigned long long UINT64;
- typedef long long INT64;
- typedef void VOID;
- //typedef unsigned long size_t;
-
- //#include <intrin.h> // MingW-w64 library header
-#pragma pack(1)
-
-#define CODE_GROUP(arg)
-#define RDATA_GROUP(arg)
-
-#define FUNC_ATTRIBUTE(arg) __attribute__((arg))
-#define MAKE_AS_A_STRING(arg) #arg
-#include <stddef.h>
-#include <gcc-intrin.h>
-
-#include <assert.h>
-#include <console/console.h>
-#include <commonlib/loglevel.h>
-
-#ifndef NULL
- #define NULL (void *)0
-#endif
-
-#else
- // -----------------------------------------------------------------------
- // Unknown or unsupported compiler
- //
- #error "Unknown compiler in use"
-#endif
-
-// -----------------------------------------------------------------------
-// Common definitions for all compilers
-//
-
-//Support forward reference construct
-#define AGESA_FORWARD_DECLARATION(x) typedef struct _##x x
-
-// The following are use in conformance to the UEFI style guide
-#define IN
-#define OUT
-
-#endif // _PORTING_H_