Revision: 19768
http://sourceforge.net/p/edk2/code/19768
Author: yzhu52
Date: 2016-01-29 04:54:37 +0000 (Fri, 29 Jan 2016)
Log Message:
-----------
BaseTools: Update BaseTools to pass VS2015 compiler
Fix some errors to pass VS2015 compiler.
1. warning C4456: declaration of xxx hides previous local declaration
2. warning C4005: 'UINT8_MAX': macro redefinition
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Source/C/GenFw/Elf32Convert.c
trunk/edk2/BaseTools/Source/C/GenVtf/GenVtf.c
trunk/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaDec.c
trunk/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
trunk/edk2/BaseTools/Source/C/VfrCompile/VfrSyntax.g
Modified: trunk/edk2/BaseTools/Source/C/GenFw/Elf32Convert.c
===================================================================
--- trunk/edk2/BaseTools/Source/C/GenFw/Elf32Convert.c 2016-01-29 04:48:55 UTC
(rev 19767)
+++ trunk/edk2/BaseTools/Source/C/GenFw/Elf32Convert.c 2016-01-29 04:54:37 UTC
(rev 19768)
@@ -1,7 +1,7 @@
/** @file
Elf32 Convert solution
-Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2013, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
@@ -815,7 +815,7 @@
FoundRelocations = TRUE;
for (RelIdx = 0; RelIdx < RelShdr->sh_size; RelIdx +=
RelShdr->sh_entsize) {
- Elf_Rel *Rel = (Elf_Rel *)((UINT8*)mEhdr + RelShdr->sh_offset +
RelIdx);
+ Rel = (Elf_Rel *)((UINT8*)mEhdr + RelShdr->sh_offset + RelIdx);
if (mEhdr->e_machine == EM_386) {
switch (ELF_R_TYPE(Rel->r_info)) {
Modified: trunk/edk2/BaseTools/Source/C/GenVtf/GenVtf.c
===================================================================
--- trunk/edk2/BaseTools/Source/C/GenVtf/GenVtf.c 2016-01-29 04:48:55 UTC
(rev 19767)
+++ trunk/edk2/BaseTools/Source/C/GenVtf/GenVtf.c 2016-01-29 04:54:37 UTC
(rev 19768)
@@ -2,7 +2,7 @@
This file contains functions required to generate a boot strap file (BSF) also
known as the Volume Top File (VTF)
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
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
@@ -2652,20 +2652,20 @@
SymFileName = VTF_SYM_FILE;
} else {
INTN OutFileNameLen = strlen(OutFileName1);
- INTN Index;
+ INTN NewIndex;
- for (Index = OutFileNameLen; Index > 0; --Index) {
- if (OutFileName1[Index] == '/' || OutFileName1[Index] == '\\') {
+ for (NewIndex = OutFileNameLen; NewIndex > 0; --NewIndex) {
+ if (OutFileName1[NewIndex] == '/' || OutFileName1[NewIndex] == '\\') {
break;
}
}
- if (Index == 0) {
+ if (NewIndex == 0) {
SymFileName = VTF_SYM_FILE;
} else {
- INTN SymFileNameLen = Index + 1 + strlen(VTF_SYM_FILE);
+ INTN SymFileNameLen = NewIndex + 1 + strlen(VTF_SYM_FILE);
SymFileName = malloc(SymFileNameLen + 1);
- memcpy(SymFileName, OutFileName1, Index + 1);
- memcpy(SymFileName + Index + 1, VTF_SYM_FILE, strlen(VTF_SYM_FILE));
+ memcpy(SymFileName, OutFileName1, NewIndex + 1);
+ memcpy(SymFileName + NewIndex + 1, VTF_SYM_FILE, strlen(VTF_SYM_FILE));
SymFileName[SymFileNameLen] = '\0';
}
if (DebugMode) {
Modified: trunk/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaDec.c
===================================================================
--- trunk/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaDec.c 2016-01-29
04:48:55 UTC (rev 19767)
+++ trunk/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaDec.c 2016-01-29
04:54:37 UTC (rev 19768)
@@ -266,7 +266,7 @@
prob = probs + RepLenCoder;
}
{
- unsigned limit, offset;
+ unsigned offset;
CLzmaProb *probLen = prob + LenChoice;
IF_BIT_0(probLen)
{
Modified: trunk/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
===================================================================
--- trunk/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c 2016-01-29
04:48:55 UTC (rev 19767)
+++ trunk/edk2/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c 2016-01-29
04:54:37 UTC (rev 19768)
@@ -3,7 +3,7 @@
LzmaEnc.c -- LZMA Encoder
2009-02-02 : Igor Pavlov : Public domain
- Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
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
@@ -132,9 +132,9 @@
}
}
-#define BSR2_RET(pos, res) { UInt32 i = 6 + ((kNumLogBits - 1) & \
+#define BSR2_RET(pos, res) { UInt32 ij = 6 + ((kNumLogBits - 1) & \
(0 - (((((UInt32)1 << (kNumLogBits + 6)) - 1) - pos) >> 31))); \
- res = p->g_FastPos[pos >> i] + (i * 2); }
+ res = p->g_FastPos[pos >> ij] + (ij * 2); }
/*
#define BSR2_RET(pos, res) { res = (pos < (1 << (kNumLogBits + 6))) ? \
p->g_FastPos[pos >> 6] + 12 : \
@@ -1148,20 +1148,18 @@
#ifdef SHOW_STAT2
if (position >= 0)
{
- unsigned i;
+ unsigned ii;
printf("\n pos = %4X", position);
- for (i = cur; i <= lenEnd; i++)
- printf("\nprice[%4X] = %d", position - cur + i, p->opt[i].price);
+ for (ii = cur; ii <= lenEnd; ii++)
+ printf("\nprice[%4X] = %d", position - cur + ii, p->opt[ii].price);
}
#endif
for (;;)
{
- UInt32 numAvailFull, newLen, numPairs, posPrev, state, posState, startLen;
- UInt32 curPrice, curAnd1Price, matchPrice, repMatchPrice;
+ UInt32 numAvailFull, newLen, posPrev, state, startLen;
+ UInt32 curPrice, curAnd1Price;
Bool nextIsChar;
- Byte curByte, matchByte;
- const Byte *data;
COptimal *curOpt;
COptimal *nextOpt;
@@ -1224,7 +1222,6 @@
prevOpt = &p->opt[posPrev];
if (pos < LZMA_NUM_REPS)
{
- UInt32 i;
reps[0] = prevOpt->backs[pos];
for (i = 1; i <= pos; i++)
reps[i] = prevOpt->backs[i - 1];
@@ -1233,7 +1230,6 @@
}
else
{
- UInt32 i;
reps[0] = (pos - LZMA_NUM_REPS);
for (i = 1; i < LZMA_NUM_REPS; i++)
reps[i] = prevOpt->backs[i - 1];
@@ -1319,12 +1315,11 @@
GET_PRICE_1(p->isRep[state2]);
/* for (; lenTest2 >= 2; lenTest2--) */
{
- UInt32 curAndLenPrice;
COptimal *opt;
UInt32 offset = cur + 1 + lenTest2;
while (lenEnd < offset)
p->opt[++lenEnd].price = kInfinityPrice;
- curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2,
state2, posStateNext);
+ UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0,
lenTest2, state2, posStateNext);
opt = &p->opt[offset];
if (curAndLenPrice < opt->price)
{
@@ -1430,7 +1425,7 @@
}
if (newLen >= startLen)
{
- UInt32 normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
+ normalMatchPrice = matchPrice + GET_PRICE_0(p->isRep[state]);
UInt32 offs, curBack, posSlot;
UInt32 lenTest;
while (lenEnd < cur + newLen)
@@ -1443,7 +1438,8 @@
GetPosSlot2(curBack, posSlot);
for (lenTest = /*2*/ startLen; ; lenTest++)
{
- UInt32 curAndLenPrice = normalMatchPrice +
p->lenEnc.prices[posState][lenTest - LZMA_MATCH_LEN_MIN];
+ UInt32 curAndLenPrice;
+ curAndLenPrice = normalMatchPrice + p->lenEnc.prices[posState][lenTest
- LZMA_MATCH_LEN_MIN];
UInt32 lenToPosState = GetLenToPosState(lenTest);
COptimal *opt;
if (curBack < kNumFullDistances)
@@ -1488,8 +1484,7 @@
/* for (; lenTest2 >= 2; lenTest2--) */
{
UInt32 offset = cur + lenTest + 1 + lenTest2;
- UInt32 curAndLenPrice;
- COptimal *opt;
+
while (lenEnd < offset)
p->opt[++lenEnd].price = kInfinityPrice;
curAndLenPrice = nextRepMatchPrice + GetRepPrice(p, 0, lenTest2,
state2, posStateNext);
@@ -1697,7 +1692,7 @@
{
UInt32 *distancesPrices = p->distancesPrices[lenToPosState];
- UInt32 i;
+
for (i = 0; i < kStartPosModelIndex; i++)
distancesPrices[i] = posSlotPrices[i];
for (; i < kNumFullDistances; i++)
Modified: trunk/edk2/BaseTools/Source/C/VfrCompile/VfrSyntax.g
===================================================================
--- trunk/edk2/BaseTools/Source/C/VfrCompile/VfrSyntax.g 2016-01-29
04:48:55 UTC (rev 19767)
+++ trunk/edk2/BaseTools/Source/C/VfrCompile/VfrSyntax.g 2016-01-29
04:54:37 UTC (rev 19768)
@@ -1,7 +1,7 @@
/*++ @file
Vfr Syntax
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
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
@@ -23,6 +23,9 @@
>>
<<
+#ifdef UINT8_MAX
+#undef UINT8_MAX
+#endif
#include "stdio.h"
#include "PBlackBox.h"
#include "DLexerBase.h"
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
