1berry/pawn-compiler
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix indirection vector calculation

Browse Source 
It was broken in commit d14f4870a8069ca446c0528a39b75e7d081ba3d5.

Fixes #63
This commit is contained in:
Zeex 2015-05-09 13:00:16 +06:00
parent 56262f42cd
commit 1cca8af0d2
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/compiler/sc1.c
View File

@ -2334,18 +2334,19 @@ static int base;
base=startlit; base=startlit;
size=1; size=1;
for (cur=0; cur<numdim-1; cur++) { for (cur=0; cur<numdim-1; cur++) {
for (i=0; i<size; i++) { /* 2 or more dimensions left, fill in an indirection vector */
/* 2 or more dimensions left, fill in an indirection vector */ if (dim[cur+1]>0) {
if (dim[cur+1]>0) { for (i=0; i<size; i++)
for (d=0; d<dim[cur]; d++) for (d=0; d<dim[cur]; d++)
litq[base++]=((size+i)*dim[cur]+d*(dim[cur+1]-1)) * sizeof(cell); litq[base++]=(size*dim[cur]+(dim[cur+1]-1)*(dim[cur]*i+d)) * sizeof(cell);
} else { } else {
/* final dimension is variable length */ /* final dimension is variable length */
constvalue *ld; constvalue *ld;
assert(dim[cur+1]==0); assert(dim[cur+1]==0);
assert(lastdim!=NULL); assert(lastdim!=NULL);
assert(skipdim!=NULL); assert(skipdim!=NULL);
accum=0; accum=0;
for (i=0; i<size; i++) {
/* skip the final dimension sizes for all earlier major dimensions */ /* skip the final dimension sizes for all earlier major dimensions */
for (d=0,ld=lastdim->next; d<*skipdim; d++,ld=ld->next) { for (d=0,ld=lastdim->next; d<*skipdim; d++,ld=ld->next) {
assert(ld!=NULL); assert(ld!=NULL);
@ -2353,13 +2354,13 @@ static int base;
for (d=0; d<dim[cur]; d++) { for (d=0; d<dim[cur]; d++) {
assert(ld!=NULL); assert(ld!=NULL);
assert(strtol(ld->name,NULL,16)==d); assert(strtol(ld->name,NULL,16)==d);
litq[base++]=((size+i)*dim[cur]+accum) * sizeof(cell); litq[base++]=(size*dim[cur]+accum) * sizeof(cell);
accum+=ld->value-1; accum+=ld->value-1;
*skipdim+=1; *skipdim+=1;
ld=ld->next; ld=ld->next;
} /* for */ } /* for */
} /* if */ } /* for */
} /* for */ } /* if */
size*=dim[cur]; size*=dim[cur];
} /* for */ } /* for */
} }