Author: laijx
Date: 2011-01-12 02:13:19 -0500 (Wed, 12 Jan 2011)
New Revision: 3455
Modified:
trunk/osprey/be/com/wn_lower.cxx
trunk/osprey/be/vho/vho_lower.cxx
Log:
Fix bug 695. There are two definitions of Promoted_Mtypes in
vho_lower.cxx and wn_lower.cxx. They are inconsistent and the version in
vho_lower.cxx is out of date.
This patch removes the definition in vho_lower.cxx and change the one in
wn_lower.cxx from static to global.
Modified: trunk/osprey/be/com/wn_lower.cxx
===================================================================
--- trunk/osprey/be/com/wn_lower.cxx 2011-01-12 01:59:27 UTC (rev 3454)
+++ trunk/osprey/be/com/wn_lower.cxx 2011-01-12 07:13:19 UTC (rev 3455)
@@ -371,7 +371,7 @@
static const char * MSTORE_ACTIONS_name(MSTORE_ACTIONS);
-static TYPE_ID Promoted_Mtype[MTYPE_LAST + 1] = {
+TYPE_ID Promoted_Mtype[MTYPE_LAST + 1] = {
MTYPE_UNKNOWN, /* MTYPE_UNKNOWN */
MTYPE_UNKNOWN, /* MTYPE_B */
MTYPE_I4, /* MTYPE_I1 */
Modified: trunk/osprey/be/vho/vho_lower.cxx
===================================================================
--- trunk/osprey/be/vho/vho_lower.cxx 2011-01-12 01:59:27 UTC (rev 3454)
+++ trunk/osprey/be/vho/vho_lower.cxx 2011-01-12 07:13:19 UTC (rev 3455)
@@ -173,37 +173,10 @@
/* Table used to promote integers less than 4 bytes into their
* 4 byte counterparts in order to get the right type for OPCODE_make_op
+ * See definitions in wn_lower.cxx
*/
+extern TYPE_ID Promoted_Mtype [MTYPE_LAST + 1];
-TYPE_ID Promoted_Mtype [MTYPE_LAST + 1] = {
- MTYPE_UNKNOWN, /* MTYPE_UNKNOWN */
- MTYPE_UNKNOWN, /* MTYPE_B */
- MTYPE_I4, /* MTYPE_I1 */
- MTYPE_I4, /* MTYPE_I2 */
- MTYPE_I4, /* MTYPE_I4 */
- MTYPE_I8, /* MTYPE_I8 */
- MTYPE_U4, /* MTYPE_U1 */
- MTYPE_U4, /* MTYPE_U2 */
- MTYPE_U4, /* MTYPE_U4 */
- MTYPE_U8, /* MTYPE_U8 */
- MTYPE_F4, /* MTYPE_F4 */
- MTYPE_F8, /* MTYPE_F8 */
- MTYPE_F10, /* MTYPE_F10 */
- MTYPE_UNKNOWN, /* MTYPE_F16 */
- MTYPE_UNKNOWN, /* MTYPE_STR */
- MTYPE_FQ, /* MTYPE_FQ */
- MTYPE_M, /* MTYPE_M */
- MTYPE_C4, /* MTYPE_C4 */
- MTYPE_C8, /* MTYPE_C8 */
- MTYPE_CQ, /* MTYPE_CQ */
- MTYPE_V, /* MTYPE_V */
- MTYPE_UNKNOWN, /* MTYPE_BS */
- MTYPE_UNKNOWN, /* MTYPE_A4 */
- MTYPE_UNKNOWN, /* MTYPE_A8 */
- MTYPE_C10, /* MTYPE_C10 */
- MTYPE_C16, /* MTYPE_C16 */
-};
-
#ifdef VHO_DEBUG
static BOOL VHO_Switch_Debug = TRUE;
static BOOL VHO_Struct_Debug = TRUE;
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Open64-devel mailing list
Open64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/open64-devel
