Changeset 828 in dev for trunk/ab5.0/abdev/compiler_x64/Opcode.h

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/compiler_x64/Opcode.h (modified) (8 diffs)

trunk/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&);
 };