Changeset 817 in dev for branches/egtra/ab5.0/abdev/compiler_x64

Timestamp:

Mar 19, 2011, 10:47:28 PM (14 years ago)

Author:

イグトランス (egtra)

Message:

compilerにおいて、各クラスのコピー禁止を明確化、ならびにコピー可能なものにムーブコンストラクタ・ムーブ代入演算子を追加。

Location:

branches/egtra/ab5.0/abdev/compiler_x64

Files:

• Opcode.h (modified) (8 diffs)
• Register.cpp (modified) (3 diffs)

branches/egtra/ab5.0/abdev/compiler_x64/Opcode.h

@@ -1 +1 @@
 #pragma once
+
+#include <array>
 
 #include "MachineFixed.h"
@@ -37 +39 @@
         , sourceCodePos( sourceCodePos )
     {
+    }
+
+    WithInfo(WithInfo&& y)
+        : name(std::move(y.name))
+        , sourceCodePos(std::move(y.sourceCodePos))
+    {
+    }
+
+    WithInfo(WithInfo const& y)
+        : name(y.name)
+        , sourceCodePos(y.sourceCodePos)
+    {
+    }
+
+    WithInfo& operator =(WithInfo&& y)
+    {
+        name = std::move(y.name);
+        sourceCodePos = std::move(y.sourceCodePos);
+        return *this;
+    }
+
+    WithInfo& operator =(WithInfo const& y)
+    {
+        return *this = std::move(WithInfo(y));
     }
 };
@@ -75 +101 @@
 
     void error_check(void);
+
+private:
+    StackFrame(StackFrame const&);
+    StackFrame& operator =(StackFrame const&);
 };
 extern StackFrame *pobj_sf;
@@ -93 +123 @@
     void backup();
     void restore();
+
+private:
+    CBlockReg(CBlockReg const&);
+    CBlockReg& operator =(CBlockReg const&);
 };
 extern CBlockReg *pobj_BlockReg;
@@ -101 +135 @@
 
     //利用可能なレジスタを列挙する関数
-    void EnumRegister(int *pRegList,int nMaxList,int *array_reg,int *sp,int AnswerReg);
-
-    int array_UseReg[16],sp_UseReg;
-
-    int array_XmmReg[16];
+    void EnumRegister(int const *pRegList,int nMaxList,int *array_reg,int *sp,int AnswerReg);
+
+    std::array<int, 16> array_UseReg;
+    int sp_UseReg;
+
+    std::array<int, 16> array_XmmReg;
     int sp_XmmReg;
 
@@ -113 +148 @@
     CRegister(){};
     CRegister(int AnswerReg);
+    
+    CRegister(CRegister const& y)
+        : array_UseReg(y.array_UseReg)
+        , sp_UseReg(y.sp_UseReg)
+        , array_XmmReg(y.array_XmmReg)
+        , sp_XmmReg(y.sp_XmmReg)
+        , init_sp_reg(y.init_sp_reg)
+        , init_sp_xmm_reg(y.init_sp_xmm_reg)
+    {
+    }
+
+    CRegister& operator =(CRegister const& y)
+    {
+        array_UseReg = y.array_UseReg;
+        sp_UseReg = y.sp_UseReg;
+        array_XmmReg = y.array_XmmReg;
+        sp_XmmReg = y.sp_XmmReg;
+        init_sp_reg = y.init_sp_reg;
+        init_sp_xmm_reg = y.init_sp_xmm_reg;
+        return *this;
+    }
+
     ~CRegister(){};
 
@@ -313 +370 @@
     void BackupParameter(int pi_num);
     void RestoreParameter(int pi_num);
+
+private:
+    ParamImpl(ParamImpl const&);
+    ParamImpl& operator =(ParamImpl const&);
 };
 
@@ -325 +386 @@
     void lock(int level);
     void unlock(int level);
+
+private:
+    CDBLockParms(CDBLockParms const&);
+    CDBLockParms& operator =(CDBLockParms const&);
 };
 

branches/egtra/ab5.0/abdev/compiler_x64/Register.cpp

@@ -112 +112 @@
 CRegister *pobj_reg;
 
-void CRegister::EnumRegister(int *pRegList,int nMaxList,int *array_reg,int *sp,int AnswerReg){
+void CRegister::EnumRegister(int const* pRegList,int nMaxList,int *array_reg,int *sp,int AnswerReg){
     int i,i2,sw=0;
 
@@ -161 +161 @@
 
     EnumRegister(
-        (int *)CalculationRegister,
+        CalculationRegister,
         sizeof(CalculationRegister)/sizeof(int),
-        array_UseReg,
+        array_UseReg.data(),
         &sp_UseReg,
         AnswerReg);
@@ -174 +174 @@
 
     EnumRegister(
-        (int *)CalculationXmmRegister,
+        CalculationXmmRegister,
         sizeof(CalculationXmmRegister)/sizeof(int),
-        array_XmmReg,
+        array_XmmReg.data(),
         &sp_XmmReg,
         AnswerReg);