Changeset 11 in dev for BasicCompiler64

Timestamp:

Dec 8, 2006, 3:25:27 AM (18 years ago)

Author:

dai_9181

Message:

Const変数の書き込み規制を有効化（グローバル/ローカル変数のみ）
定数オブジェクトと定数メンバは未実装。

Location:

BasicCompiler64

Files:

• BasicCompiler.vcproj (modified) (2 diffs)
• CParameter.cpp (modified) (1 diff)
• Compile_Calc.cpp (modified) (1 diff)
• Compile_CallProc.cpp (modified) (2 diffs)
• Compile_Func.cpp (modified) (3 diffs)
• Compile_ProcOp.cpp (modified) (2 diffs)
• Compile_Statement.cpp (modified) (1 diff)
• Compile_Var.cpp (modified) (25 diffs)
• NumOpe.cpp (modified) (1 diff)
• Opcode.h (modified) (1 diff)
• OperatorProc.cpp (modified) (1 diff)
• increment.cpp (modified) (1 diff)

BasicCompiler64/BasicCompiler.vcproj

@@ -1386 +1386 @@
                     >
                 </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\Variable.cpp"
-                    >
-                </File>
                 <Filter
                     Name="Intermediate"
@@ -1511 +1507 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\Const.h"
+                        >
+                    </File>
+                </Filter>
+                <Filter
+                    Name="Variable"
+                    >
+                    <File
+                        RelativePath="..\BasicCompiler_Common\Variable.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\Variable.h"
                         >
                     </File>

BasicCompiler64/CParameter.cpp

@@ -616 +616 @@
                 int VarType;
                 LONG_PTR lpVarIndex;
-                if(!GetVarOffset(1,Parms[i2],&VarType,&RelativeVar,&lpVarIndex)) continue;
+                if(!GetVarOffsetReadOnly(
+                    Parms[i2],
+                    &VarType,
+                    &RelativeVar,
+                    &lpVarIndex)) continue;
 
                 if(DummyTypeInfo.type!=DEF_ANY){

BasicCompiler64/Compile_Calc.cpp

@@ -535 +535 @@
     //変数アドレスを取得
     RELATIVE_VAR VarRelativeVar;
-    if(!GetVarOffset(
-        1,
+    if(!GetVarOffsetReadWrite(
         variable,
         &VarType,

BasicCompiler64/Compile_CallProc.cpp

@@ -187 +187 @@
     RELATIVE_VAR RelativeVar;
     LONG_PTR lp;
-    GetVarOffset(1,variable,&i,&RelativeVar,&lp);
+    GetVarOffsetReadOnly(variable,&i,&RelativeVar,&lp);
     SetVarPtrToReg(REG_RAX,&RelativeVar);
 
@@ -408 +408 @@
             else{
                 RELATIVE_VAR RelativeVar;
-                if(!GetVarOffset(1,ObjectName,&i2,&RelativeVar,0)) return -1;
+                if(!GetVarOffsetReadOnly(ObjectName,&i2,&RelativeVar,0)) return -1;
                 SetVarPtrToReg(REG_RCX,&RelativeVar);
 

BasicCompiler64/Compile_Func.cpp

@@ -74 +74 @@
     int SubScripts[MAX_ARRAYDIM];
     RELATIVE_VAR RelativeVar;
-    if(!GetVarOffset(1,tempParm,&type,&RelativeVar,&lpIndex,SubScripts)) return;
+    if(!GetVarOffsetReadOnly(tempParm,&type,&RelativeVar,&lpIndex,SubScripts)) return;
 
 
@@ -147 +147 @@
                 RELATIVE_VAR RelativeVar;
                 int type;
-                if(!GetVarOffset(1,ObjectName,&type,&RelativeVar,(LONG_PTR *)&pobj_c)) return;
+                if(!GetVarOffsetReadOnly(ObjectName,&type,&RelativeVar,(LONG_PTR *)&pobj_c)) return;
                 SetVarPtrToReg(REG_RCX,&RelativeVar);
 
@@ -217 +217 @@
 
     //変数のアドレスを取得
-    if(!GetVarOffset(1,Parameter,&type,&RelativeVar,0)) return;
+    if(!GetVarOffsetReadOnly(Parameter,&type,&RelativeVar,0)) return;
 
     SetVarPtrToReg(REG_RAX,&RelativeVar);

BasicCompiler64/Compile_ProcOp.cpp

@@ -326 +326 @@
 
         lstrcpy(LocalVar[MaxLocalVarNum].name,psi->pRealParmInfo[i3].name);
+
+        // TODO: パラメータのConst定義の指定が未完成
+        LocalVar[MaxLocalVarNum].bConst=false;
 
         LocalVar[MaxLocalVarNum].bArray=psi->pRealParmInfo[i3].bArray;
@@ -736 +739 @@
             temp="_System_ReturnValue";
         else temp=psi->name;
-        GetVarOffset(1,temp,&i3,&RelativeVar,&lpIndex);
+        GetVarOffsetReadWrite(temp,&i3,&RelativeVar,&lpIndex);
 
         i3=psi->ReturnType;

BasicCompiler64/Compile_Statement.cpp

@@ -1179 +1179 @@
 
         LONG_PTR lpIndex;
-        RELATIVE_VAR RelativeVar;
-        GetVarOffset(1,temporary,&type,&RelativeVar,&lpIndex);
+        type = GetVarType(temporary, &lpIndex, 1);
 
         sprintf(temp2,"_System_InputDataPtr[%d]=VarPtr(%s)",i4,temporary);

BasicCompiler64/Compile_Var.cpp

@@ -179 +179 @@
     return 1;
 }
-BOOL GetMemberOffset(BOOL bError,CClass *pobj_c,char *member,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpNestIndex,BOOL bPrivateAccess){
+BOOL GetMemberOffset(bool ErrorEnabled,CClass *pobj_c,char *member,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpNestIndex,BOOL bPrivateAccess){
     int i,offset;
 
@@ -202 +202 @@
     offset=GetSizeOfClassMember(pobj_c,VarName,&i);
     if(i==pobj_c->iMemberNum){
-        if(bError) SetError(103,VarName,cp);
+        if(ErrorEnabled) SetError(103,VarName,cp);
         return 0;
     }
@@ -211 +211 @@
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
         if(pobj_c->ppobj_Member[i]->dwAccess==ACCESS_NON){
-            if(bError) SetError(107,VarName,cp);
+            if(ErrorEnabled) SetError(107,VarName,cp);
             return 0;
         }
@@ -218 +218 @@
         if((bPrivateAccess==0&&pobj_c->ppobj_Member[i]->dwAccess==ACCESS_PRIVATE)||
             pobj_c->ppobj_Member[i]->dwAccess==ACCESS_NON){
-            if(bError) SetError(107,VarName,cp);
+            if(ErrorEnabled) SetError(107,VarName,cp);
             return 0;
         }
         else if(bPrivateAccess==0&&pobj_c->ppobj_Member[i]->dwAccess==ACCESS_PROTECTED){
-            if(bError) SetError(108,VarName,cp);
+            if(ErrorEnabled) SetError(108,VarName,cp);
             return 0;
         }
@@ -239 +239 @@
     else{
         if(lpPtrOffset[0]){
-            if(bError) SetError(16,member,cp);
+            if(ErrorEnabled) SetError(16,member,cp);
             return 0;
         }
@@ -256 +256 @@
         //配列オフセット
         if(!GetArrayOffset(pobj_c->ppobj_Member[i]->SubScripts,array,*pType,pobj_c->ppobj_Member[i]->TypeInfo.u.lpIndex)){
-            if(bError) SetError(14,member,cp);
+            if(ErrorEnabled) SetError(14,member,cp);
         }
     }
@@ -268 +268 @@
         if(*pType==DEF_OBJECT){
             if(RefType!=DEF_OBJECT){
-                if(bError) SetError(104,member,cp);
+                if(ErrorEnabled) SetError(104,member,cp);
                 return 0;
             }
@@ -278 +278 @@
                 //pObj[n].member
                 if(RefType!=DEF_OBJECT){
-                    if(bError) SetError(104,member,cp);
+                    if(ErrorEnabled) SetError(104,member,cp);
                     return 0;
                 }
@@ -291 +291 @@
                 //pObj->member
                 if(RefType!=DEF_PTR_OBJECT){
-                    if(bError) SetError(104,member,cp);
+                    if(ErrorEnabled) SetError(104,member,cp);
                     return 0;
                 }
@@ -315 +315 @@
                 //ppObj[n]->member
                 if(RefType!=DEF_PTR_OBJECT){
-                    if(bError) SetError(104,member,cp);
+                    if(ErrorEnabled) SetError(104,member,cp);
                     return 0;
                 }
@@ -329 +329 @@
             }
             else{
-                if(bError) SetError(104,member,cp);
+                if(ErrorEnabled) SetError(104,member,cp);
                 return 0;
             }
         }
 
-        if(!GetMemberOffset(bError,
+        if(!GetMemberOffset(ErrorEnabled,
             pobj_c->ppobj_Member[i]->TypeInfo.u.pobj_Class,
             NestMember,
@@ -371 +371 @@
     SetReg_WholeVariable(DEF_PTR_VOID,&RelativeVar,reg);
 }
-BOOL GetVarOffset(BOOL bError,char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss){
+BOOL GetVarOffset(bool ErrorEnabled,bool WriteAccess,char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss){
     extern BOOL bCompilingGlobal;
     int i,RefType;
@@ -387 +387 @@
     LONG_PTR lpIndex;
     int *pSubScripts;
+    bool bConst = false;
 
 
@@ -423 +424 @@
             if(plpIndex) *plpIndex=lpIndex;
             pSubScripts=LocalVar[i].SubScripts;
+            bConst = LocalVar[i].bConst;
 
             goto ok;
@@ -463 +465 @@
 
         pRelativeVar->dwKind=VAR_DIRECTMEM;
-        if(!GetMemberOffset(bError,pobj_CompilingClass,variable,pType,pRelativeVar,&lpIndex,1)) return 0;
+        if(!GetMemberOffset(ErrorEnabled,pobj_CompilingClass,variable,pType,pRelativeVar,&lpIndex,1)) return 0;
         if(plpIndex) *plpIndex=lpIndex;
         return 1;
@@ -534 +536 @@
     }
 
-    if(bError) SetError(3,variable,cp);
+    if(ErrorEnabled) SetError(3,variable,cp);
     pRelativeVar->dwKind=NON_VAR;
     return 0;
@@ -563 +565 @@
     if(plpIndex) *plpIndex=lpIndex;
     pSubScripts=GlobalVar[i].SubScripts;
+    bConst = GlobalVar[i].bConst;
 
 
@@ -568 +571 @@
 ok:
 
+    if(bConst && WriteAccess){
+        //Const定義の変数に書き込みアクセスをしようとした場合
+        SetError(61,VarName,cp);
+    }
 
     if(array[0]==0&&pSubScripts[0]!=-1){
@@ -600 +607 @@
 
             LONG_PTR lp2;
-            if(!GetMemberOffset(bError,(CClass *)lpIndex,member,pType,pRelativeVar,&lp2,0)) return 0;
+            if(!GetMemberOffset(ErrorEnabled,(CClass *)lpIndex,member,pType,pRelativeVar,&lp2,0)) return 0;
             if(plpIndex) *plpIndex=lp2;
         }
@@ -616 +623 @@
 
                 LONG_PTR lp2;
-                if(!GetMemberOffset(bError,(CClass *)lpIndex,member,pType,pRelativeVar,&lp2,0)) return 0;
+                if(!GetMemberOffset(ErrorEnabled,(CClass *)lpIndex,member,pType,pRelativeVar,&lp2,0)) return 0;
                 if(plpIndex) *plpIndex=lp2;
             }
@@ -634 +641 @@
 
                 LONG_PTR lp2;
-                if(!GetMemberOffset(bError,(CClass *)lpIndex,member,pType,pRelativeVar,&lp2,0)) return 0;
+                if(!GetMemberOffset(ErrorEnabled,(CClass *)lpIndex,member,pType,pRelativeVar,&lp2,0)) return 0;
                 if(plpIndex) *plpIndex=lp2;
             }
@@ -658 +665 @@
 
                 LONG_PTR lp2;
-                if(!GetMemberOffset(bError,(CClass *)lpIndex,member,pType,pRelativeVar,&lp2,0)) return 0;
+                if(!GetMemberOffset(ErrorEnabled,(CClass *)lpIndex,member,pType,pRelativeVar,&lp2,0)) return 0;
                 if(plpIndex) *plpIndex=lp2;
             }
@@ -1109 +1116 @@
             lstrcpy(pVar->name,VarName);
             pVar->fRef=0;
-            if(dwFlag & DIMFLAG_CONST) pVar->bConst = 1;
-            else pVar->bConst = 0;
+            if(dwFlag & DIMFLAG_CONST) pVar->bConst = true;
+            else pVar->bConst = false;
             if(SubScripts[0]==-1) pVar->bArray=0;
             else pVar->bArray=1;
@@ -1124 +1131 @@
 
             if(InitBuf[0]){
+                //初期代入時のみ、書き込みアクセスを許可する
+                bool bConstBack = pVar->bConst;
+                pVar->bConst = false;
+
                 int result = InitLocalVar(-pVar->offset,
                     pVar->type,
@@ -1136 +1147 @@
                     OpcodeCalc(temporary);
                 }
+
+                pVar->bConst = bConstBack;
             }
             else{

BasicCompiler64/NumOpe.cpp

@@ -423 +423 @@
 
                     RELATIVE_VAR RelativeVar;
-                    if(GetVarOffset(0,term,&i2,&RelativeVar,&index_stack[sp])){
+                    if(GetVarOffset(
+                        false,  //エラー表示あり
+                        false,  //読み込み専用
+                        term,
+                        &i2,&RelativeVar,&index_stack[sp])){
                         //////////
                         // 変数

BasicCompiler64/Opcode.h

@@ -317 +317 @@
 void GetWithName(char *buffer);
 void SetThisPtrToReg(int reg);
-BOOL GetVarOffset(BOOL bError,char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss=0);
+BOOL GetVarOffset(bool ErrorEnabled,bool WriteAccess,char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss=0);
 BOOL SetInitGlobalData(int offset,int type,LONG_PTR lpIndex,int *SubScripts,char *InitBuf);
 #define DIMFLAG_INITDEBUGVAR            1

BasicCompiler64/OperatorProc.cpp

@@ -325 +325 @@
             int VarType;
             LONG_PTR lpVarIndex;
-            if(!GetVarOffset(
-                1,
+            if(!GetVarOffsetReadOnly(
                 szTempVarName,
                 &VarType,

BasicCompiler64/increment.cpp

@@ -12 +12 @@
     ///////////////////////////
 
-    if(!GetVarOffset(
-        1,
+    if(!GetVarOffsetReadWrite(
         lpszLeft,
         &VarType,