Skip to content

Commit

Permalink
Pass 2 runs on simple test case
Browse files Browse the repository at this point in the history
  • Loading branch information
@John-Nagle
John-Nagle committed Jan 10, 2017
1 parent 2155cea commit 81b051a
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ analyzer1
pascmp
pasver1
errs
src/bin
2 changes: 1 addition & 1 deletion src/CPC2/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ all: pasver2
install: pasver2
-rm -f $(DEST)/pasver2.old
-mv $(DEST)/pasver2 $(DEST)/pasver2.old
cp pasver2 $(DEST)
cp pasver2 $(DEST)/pasver2
#
P2SRC=p2consts.i p2iconst.h $(PASS1)/P1X-VER00.h $(PASS1)/P1X-VER01.h p2defs.i p2vars.i \
p2tables.i p2tprint.i p2errors.i p2util.i p2block.i p2varfile.i \
Expand Down
6 changes: 3 additions & 3 deletions src/CPC2/p2alias.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ procedure WHATalias; const WHAT = '@(#)p2alias.i 2.1'; begin SINK := WHAT; en
function identical(p1, p2: ptn) { expressions to compare }
: boolean;
var nodiff: boolean; { true if no differences }
i: 1..maxarg; { for loop }
i: cardinal; { for loop }
begin
identical := false; { assume failure }
with p1^ do begin { using first node }
Expand Down Expand Up @@ -180,8 +180,8 @@ var r: refnodep; { working ref node }
expr1: ptn; { first VAR expression }
base1: varnodep; { base of arg }
out1: boolean; { true if arg is output }
i: 1..maxarg; { for arg loop }
j: longint; { want 1..maxarg + 1 }
i: cardinal; { for arg loop }
j: cardinal; { want 1..maxarg + 1 }
outvar: array [1..maxarg] of boolean; { true if output arg }
formal: varnodep; { for formal arg chaining }
begin
Expand Down
4 changes: 2 additions & 2 deletions src/CPC2/p2augment.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,14 +317,14 @@ end {selectors};
}
procedure augment1(p: ptn; { starting node }
need: machinetype); { type needed by caller }
var i: 1..maxarg; { for loop }
var i: cardinal; { for loop }
j: 1..5; { position in optab arg list }
{
augmentcall -- handle calls to user-defined procedures
}
procedure augmentcall(p: ptn; { starting node }
need: machinetype); { type needed by caller }
var i: 1..maxarg; { for loop }
var i: cardinal; { for loop }
q: varnodep; { argument being considered }
parg: ptn; { pointer to arg being worked }
begin
Expand Down
4 changes: 2 additions & 2 deletions src/CPC2/p2bound.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ end {subscriptcheck};
safeactuals -- handle calls to user-defined functions
}
procedure safeactuals(p: ptn); { call node }
var i: 1..maxarg; { for loop }
var i: cardinal; { for loop }
q: varnodep; { argument being considered }
parg: ptn; { pointer to arg being worked }
begin
Expand Down Expand Up @@ -329,7 +329,7 @@ end {safeactuals};
REQUIRE operators.
}
procedure safeexpr(p: ptn); { FORWARD resolution }
var i: 1..maxarg; { arg loop }
var i: cardinal; { arg loop }
j: 1..5; { position in optab args }
sideeffectinthisexpr: boolean; { side effect found }
begin {safeexpr}
Expand Down
2 changes: 1 addition & 1 deletion src/CPC2/p2case.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var casecodes: array [1..maxcases] of targetinteger; { case codes seen }
casecount: 0..maxcases; { number of cases }
beforelabel: labelid; { start of case label }
afterlabel: labelid; { end of case label }
i: 1..maxarg; { for arg scan }
i: cardinal; { for arg scan }
caseexpr: ptn; { expression in CASE statement }
caseline: lineinfo; { source line of CASE statement }
{
Expand Down
4 changes: 2 additions & 2 deletions src/CPC2/p2expr.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ end {genmselector};
genmfunctioncall -- generate function call in message
}
procedure genmfunctioncall(p: ptn);
var i: 1..maxarg; { for loop }
var i: cardinal; { for loop }
begin
with p^ do begin { using given node }
assert(code = fcallop); { must be fcall }
Expand Down Expand Up @@ -293,7 +293,7 @@ procedure genmexpr1(p: ptn; { node }
callerpred: precedence); { precedence of caller }
{ FORWARD resolution }
var iclass: iopclass; { icode op class }
i: 0..maxarg; { for arg loop }
i: cardinal; { for arg loop }
begin { genmexpr1 }
with p^ do begin { using given node }
if code = fcallop then begin { if call }
Expand Down
6 changes: 3 additions & 3 deletions src/CPC2/p2loop.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var forvararg: ptn; { FOR control variable arg }
forinvariant -- handle invariant of for loop
}
procedure forinvariant(pinvar: ptn); { invariant expression }
var i: 1..maxarg; { arg position }
var i: cardinal; { arg position }
begin
genassertrequires(pinvar); { require invariant expr }
genstring15('HANG'); { HANG - break at invariant }
Expand Down Expand Up @@ -381,7 +381,7 @@ var statearg: ptn; { STATE arg }
statefound: boolean; { true if STATE found }
measuretid: tempid; { id for MEASURE variable }
flagtid: tempid; { id for Jcode flag }
j: 1..maxarg; { for loops }
j: cardinal; { for loops }
label0, label1, label2, label3: labelid; { these numbers match Jcode doc}
warg: ptn; { working arg }
{
Expand Down Expand Up @@ -616,7 +616,7 @@ end {genloopbody};
in loop
}
procedure finishloop;
var i: 0..maxarg; { for loop }
var i: cardinal; { for loop }
exitline: lineinfo; { location of exit line }
begin
for i := 1 to exitlim do begin { for all loop exits }
Expand Down
4 changes: 2 additions & 2 deletions src/CPC2/p2routine.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ end {saveglobals};
bindoldargs -- bind args for use as ".old" in exit condition
}
procedure bindoldargs(var tab: oldargtab); { using given tab }
var i: 1..oldargsmax; { old arg counter }
var i: cardinal; { old arg counter }
begin
with tab do { use given tab }
for i := 1 to oldargcount do begin { for all old args }
Expand Down Expand Up @@ -252,7 +252,7 @@ end {genspecrequire};
assertions of requested subcodes
}
procedure specscan(p: ptn); { node in assertions }
var i: 0..maxarg; { for arg loop }
var i: cardinal; { for arg loop }
begin
if p <> nil then begin { if any expressions }
with p^ do begin { using given node }
Expand Down
4 changes: 2 additions & 2 deletions src/CPC2/p2spec.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ end {adddefineds};
}
procedure checkassertion(p: ptn; { single assertion }
subcode: longint); { kind of vardecl }
var i: 1..maxarg; { for arg loop }
var i: cardinal; { for arg loop }
base: varnodep; { base variable of item }
begin
with p^ do begin { using given node }
Expand Down Expand Up @@ -397,7 +397,7 @@ end {checkdepth};
checkassertions -- check assertions against in/out lists
}
procedure checkassertions(var p: ptn); { starting node }
var i: 1..maxarg; { for arg loop }
var i: cardinal; { for arg loop }
begin
if p <> nil then with p^ do begin { using given node }
if code = seqop then begin { if sequence }
Expand Down
6 changes: 3 additions & 3 deletions src/CPC2/p2util.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ end {vardrive};
}
procedure seqdrive(p: ptn; { starting node }
doseq: pptn); { procedure arg }
var i: 1..maxarg; { working arg position }
var i: cardinal; { working arg position }
parg: ptn; { working arg }
begin
if p <> nil then { if work to do }
Expand All @@ -602,7 +602,7 @@ end {seqdrive};
procedure varinexprdrive(expr: ptn; { expression }
dovar: pvarnodep); { call on find }
procedure vdrive(p: ptn); { expression to scan }
var i: 1..maxarg; { for loop }
var i: cardinal; { for loop }
begin
if p <> nil then with p^ do begin { using given node }
if code in [varblop, dvadop, paramop] then begin{ if variable }
Expand Down Expand Up @@ -687,7 +687,7 @@ end {blockdrive};
procedure functinexprdrive(expr: ptn; { expression }
dovar: pvarnodep); { call on find }
procedure fdrive(p: ptn); { expression to scan }
var i: 1..maxarg; { for loop }
var i: cardinal; { for loop }
begin
if p <> nil then with p^ do begin { using given node }
if code = callop then { if call }
Expand Down

0 comments on commit 81b051a

Please sign in to comment.