fix incorrect initialization of macroopt, add protection

ruv · ac · commit 0bbd8dda9094 · 2017-06-19T00:14:47.000+02:00
diff --git a/lib/SPF.ERR b/lib/SPF.ERR
@@ -161,6 +161,7 @@
 -2009 Library not found
 -2010 Procedure not found
 -2011 Unknown vocabulary
+-2301 macroopt: ���ਥ����� OP0 ��। �믮������� SetOP
 0xC0000001L UNSUCCESSFUL              
 0x00000000L WAIT_0                    
 0x00000080L ABANDONED_WAIT_0          
diff --git a/lib/SPF.eng.ERR b/lib/SPF.eng.ERR
@@ -161,6 +161,7 @@
 -2009 Library not found
 -2010 Procedure not found
 -2011 Unknown vocabulary
+-2301 macroopt: unacceptable OP0 before executing SetOP
 0xC0000001L UNSUCCESSFUL              
 0x00000000L WAIT_0                    
 0x00000080L ABANDONED_WAIT_0          
diff --git a/src/macroopt.f b/src/macroopt.f
@@ -59,9 +59,23 @@
 DROP
 
 : SetOP ( -- )
+ DP @ OP0 @ = IF -8FD THROW THEN \ -2301 THROW \ do not alow OP1 be the same as OP0
  OP0 OP1 OpBuffSize CELL- CMOVE>
  DP @ OP0 !
 ;
+( ������ ������� ������������ �������� ������� ���� OP0 ��������� �� ��� �� ����� ��� � OP1
+  ����� ����� ��������� ���� ����� �������� SetOP �������� HERE �� ��������,
+  ��� OP0 ��������� �� HERE ����� ������� SetOP [� ��� ����� ��� ���������].
+
+  �������, � SetOP ��������� ������ �� ����� ��������.
+
+  �� �������� ������ ������ �������������� ���:
+    SetOP 1 2 :NONAME SWAP ; EXECUTE . . \ -> 5687064 1
+  � ���� ������ ������� ����������� ������� "M\ 15A"  �.�.  OP1 ... MOV_EDX_[EBP] ... ���� TRUE
+  � ���� ����, ��� ���������  [ OP1 ] "@ 2+ C@  OP0 @ 2+ C@ ="  ������������ TRUE.
+
+  2015-12-26 ~ruv
+)
 
 : ToOP0 ( OPn -- )
      OP0 OpBuffSize CELL- CMOVE ;
diff --git a/src/spf_init.f b/src/spf_init.f
@@ -202,7 +202,6 @@
 [ELSE]
 : (INIT)
 [THEN]
-  SetOP
   NATIVE-LINES
   0 TO H-STDLOG
   CONSOLE-HANDLES

-Original file line number
+Diff line change
 DROP
 : SetOP ( -- )
 + DP @ OP0 @ = IF -8FD THROW THEN \ -2301 THROW \ do not alow OP1 be the same as OP0
  OP0 OP1 OpBuffSize CELL- CMOVE>
  DP @ OP0 !
+;
 +( Ìíîãèå ïðàâèëà îïòèìèçàòîðà ðàáîòàþò íåâåðíî åñëè OP0 óêàçûâàåò íà òîò æå àäðåñ ÷òî è OP1
 +  Òàêîå ìîæåò ïðîèçîéòè åñëè ìåæäó âûçîâûìè SetOP çíà÷åíèå HERE íå ìåíÿåòñÿ,
 +  èëè OP0 óêàçûâàåò íà HERE ïåðåä âûçîâîì SetOP [â òîì ÷èñëå êàê ñëåäñòâèå].
++
 +  Ïîýòîìó, â SetOP äîáàâëåíà çàùèòà îò òàêîé ñèòóàöèè.
++
 +  Äî ââåäåíèÿ çàùèòû îøèáêó äåìîíñòðèðîâàë êîä:
 +    SetOP 1 2 :NONAME SWAP ; EXECUTE . . \ -> 5687064 1
 +  Â ýòîì ñëó÷àå íåâåðíî ñðàáàòûâàåò ïðàâèëî "M\ 15A"  ò.ê.  OP1 ... MOV_EDX_[EBP] ... äàåò TRUE
 +  â ñèëó òîãî, ÷òî âûðàæåíèå  [ OP1 ] "@ 2+ C@  OP0 @ 2+ C@ ="  òîæäåñòâåííî TRUE.
++
 +  2015-12-26 ~ruv
 +)
 : ToOP0 ( OPn -- )
      OP0 OpBuffSize CELL- CMOVE ;