Changeset 592 in dev for trunk/ab5.0/abdev

Timestamp:

May 10, 2008, 6:18:51 PM (17 years ago)

Author:

dai_9181

Message:

[591]を64bit版にマージ。

Location:

trunk/ab5.0/abdev/compiler_x64

Files:

• Compile_Var.cpp (modified) (2 diffs)
• NumOpe.cpp (modified) (1 diff)

trunk/ab5.0/abdev/compiler_x64/Compile_Var.cpp

@@ -884 +884 @@
             char *temp;
             temp=(char *)i64data;
-            i2=compiler.GetObjectModule().dataTable.AddString( temp );
+            if( compiler.IsUnicode() )
+            {
+                i2 = compiler.GetObjectModule().dataTable.AddWString( Jenga::Common::ToWString( temp ) );
+            }
+            else
+            {
+                i2 = compiler.GetObjectModule().dataTable.AddString( temp );
+            }
             HeapDefaultFree(temp);
 
@@ -1053 +1060 @@
             char *temp;
             temp=(char *)i64data;
-            i2=compiler.GetObjectModule().dataTable.AddString( temp );
+            if( compiler.IsUnicode() )
+            {
+                i2 = compiler.GetObjectModule().dataTable.AddWString( Jenga::Common::ToWString( temp ) );
+            }
+            else
+            {
+                i2 = compiler.GetObjectModule().dataTable.AddString( temp );
+            }
             HeapDefaultFree(temp);
 

trunk/ab5.0/abdev/compiler_x64/NumOpe.cpp

@@ -1041 +1041 @@
                     bLiteralCalculation=0;
 
-                    i2 = compiler.GetObjectModule().dataTable.AddString( term, i3 );
+                    if( compiler.IsUnicode() )
+                    {
+                        i2 = compiler.GetObjectModule().dataTable.AddWString( Jenga::Common::ToWString( std::string( term, i3 ) ) );
+                    }
+                    else
+                    {
+                        i2 = compiler.GetObjectModule().dataTable.AddString( std::string( term, i3 ) );
+                    }
 
                     //mov reg,i2