* changed max_operands to 2 for the Z80

git-svn-id: branches/z80@44758 -

compiler/utils/mkz80ins.pp

@@ -23,6 +23,7 @@ uses
 const
   Version = '1.0.0';
   HeaderStr = '{ don''t edit, this file is generated from z80ins.dat; to regenerate, run ''make insdat'' in the compiler directory }';
+  max_operands = 2;
 
   ParamTypes: array [0..40,0..1] of string = (
     ('void',  'OT_NONE'),
@@ -201,7 +202,9 @@ begin
             Writeln(OutputFiles.InsTabFile,'    opcode  : A_',op,';');
             Writeln(OutputFiles.InsTabFile,'    ops     : ',Length(S_Params),';');
             Write(OutputFiles.InsTabFile,  '    optypes : (');
-            for ParamIdx:=0 to 3 do
+            if Length(S_Params)>max_operands then
+              raise Exception.Create('Too many operands');
+            for ParamIdx:=0 to max_operands-1 do
               begin
                 if ParamIdx<>0 then
                   Write(OutputFiles.InsTabFile,',');

compiler/z80/aasmcpu.pas

@@ -88,7 +88,7 @@ uses
       tinsentry = record
         opcode  : tasmop;
         ops     : byte;
-        optypes : array[0..3] of toperandtype;
+        optypes : array[0..max_operands-1] of toperandtype;
         code    : array[0..maxinfolen] of char;
         flags   : longint;
       end;

compiler/z80/cpubase.pas

@@ -143,7 +143,7 @@ unit cpubase;
 *****************************************************************************}
 
     const
-      max_operands = 4;
+      max_operands = 2;
 
       maxintregs = 15;
       maxfpuregs = 0;