|
Lines 1-168
Link Here
|
| 1 |
Index: control.c |
|
|
| 2 |
=================================================================== |
| 3 |
RCS file: /usr/cvs/hercules/hercules/control.c,v |
| 4 |
retrieving revision 1.266 |
| 5 |
retrieving revision 1.267 |
| 6 |
diff -u -p -r1.266 -r1.267 |
| 7 |
--- control.c 11 Apr 2008 14:28:00 -0000 1.266 |
| 8 |
+++ control.c 6 May 2008 22:15:42 -0000 1.267 |
| 9 |
@@ -1968,16 +1971,16 @@ U16 updated = 0; |
| 10 |
m = n; |
| 11 |
|
| 12 |
/* Copy from operand beginning */ |
| 13 |
- for (i = 0; i < m; i++) |
| 14 |
+ for (i = 0; i < m; i++, p1++) |
| 15 |
{ |
| 16 |
- regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1++); |
| 17 |
+ regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1); |
| 18 |
updated |= BIT((r1 + i) & 0xF); |
| 19 |
} |
| 20 |
|
| 21 |
/* Copy from next page */ |
| 22 |
- for ( ; i < n; i++) |
| 23 |
+ for ( ; i < n; i++, p2++) |
| 24 |
{ |
| 25 |
- regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2++); |
| 26 |
+ regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2); |
| 27 |
updated |= BIT((r1 + i) & 0xF); |
| 28 |
} |
| 29 |
|
| 30 |
Index: esame.c |
| 31 |
=================================================================== |
| 32 |
RCS file: /usr/cvs/hercules/hercules/esame.c,v |
| 33 |
retrieving revision 1.201 |
| 34 |
retrieving revision 1.202 |
| 35 |
diff -u -p -r1.201 -r1.202 |
| 36 |
--- esame.c 11 Apr 2008 14:28:29 -0000 1.201 |
| 37 |
+++ esame.c 6 May 2008 22:15:42 -0000 1.202 |
| 38 |
@@ -4038,8 +4041,8 @@ U32 *p1, *p2; |
| 39 |
{ |
| 40 |
/* Boundary not crossed */ |
| 41 |
n >>= 2; |
| 42 |
- for (i = 0; i < n; i++) |
| 43 |
- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++); |
| 44 |
+ for (i = 0; i < n; i++, p1++) |
| 45 |
+ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1); |
| 46 |
} |
| 47 |
else |
| 48 |
{ |
| 49 |
@@ -4052,11 +4055,11 @@ U32 *p1, *p2; |
| 50 |
{ |
| 51 |
/* Addresses are word aligned */ |
| 52 |
m >>= 2; |
| 53 |
- for (i = 0; i < m; i++) |
| 54 |
- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++); |
| 55 |
+ for (i = 0; i < m; i++, p1++) |
| 56 |
+ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1); |
| 57 |
n >>= 2; |
| 58 |
- for ( ; i < n; i++) |
| 59 |
- regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2++); |
| 60 |
+ for ( ; i < n; i++, p2++) |
| 61 |
+ regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2); |
| 62 |
} |
| 63 |
else |
| 64 |
{ |
| 65 |
@@ -6728,16 +6731,16 @@ U32 *p1, *p2 = NULL; |
| 66 |
m = n; |
| 67 |
|
| 68 |
/* Load from first page */ |
| 69 |
- for (i = 0; i < m; i++) |
| 70 |
+ for (i = 0; i < m; i++, p1++) |
| 71 |
{ |
| 72 |
- regs->AR((r1 + i) & 0xF) = fetch_fw (p1++); |
| 73 |
+ regs->AR((r1 + i) & 0xF) = fetch_fw (p1); |
| 74 |
SET_AEA_AR(regs, (r1 + i) & 0xF); |
| 75 |
} |
| 76 |
|
| 77 |
/* Load from next page */ |
| 78 |
- for ( ; i < n; i++) |
| 79 |
+ for ( ; i < n; i++, p2++) |
| 80 |
{ |
| 81 |
- regs->AR((r1 + i) & 0xF) = fetch_fw (p2++); |
| 82 |
+ regs->AR((r1 + i) & 0xF) = fetch_fw (p2); |
| 83 |
SET_AEA_AR(regs, (r1 + i) & 0xF); |
| 84 |
} |
| 85 |
|
| 86 |
@@ -6811,8 +6814,8 @@ U32 *p1, *p2; |
| 87 |
{ |
| 88 |
/* Boundary not crossed */ |
| 89 |
n >>= 2; |
| 90 |
- for (i = 0; i < n; i++) |
| 91 |
- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++); |
| 92 |
+ for (i = 0; i < n; i++, p1++) |
| 93 |
+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1); |
| 94 |
} |
| 95 |
else |
| 96 |
{ |
| 97 |
@@ -6825,11 +6828,11 @@ U32 *p1, *p2; |
| 98 |
{ |
| 99 |
/* Addresses are word aligned */ |
| 100 |
m >>= 2; |
| 101 |
- for (i = 0; i < m; i++) |
| 102 |
- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++); |
| 103 |
+ for (i = 0; i < m; i++, p1++) |
| 104 |
+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1); |
| 105 |
n >>= 2; |
| 106 |
- for ( ; i < n; i++) |
| 107 |
- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++); |
| 108 |
+ for ( ; i < n; i++, p2++) |
| 109 |
+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2); |
| 110 |
} |
| 111 |
else |
| 112 |
{ |
| 113 |
Index: general1.c |
| 114 |
=================================================================== |
| 115 |
RCS file: /usr/cvs/hercules/hercules/general1.c,v |
| 116 |
retrieving revision 1.165 |
| 117 |
retrieving revision 1.166 |
| 118 |
diff -u -p -r1.165 -r1.166 |
| 119 |
--- general1.c 11 Apr 2008 14:28:44 -0000 1.165 |
| 120 |
+++ general1.c 6 May 2008 22:15:42 -0000 1.166 |
| 121 |
@@ -3413,16 +3416,16 @@ U32 *p1, *p2 = NULL; |
| 122 |
m = n; |
| 123 |
|
| 124 |
/* Copy from operand beginning */ |
| 125 |
- for (i = 0; i < m; i++) |
| 126 |
+ for (i = 0; i < m; i++, p1++) |
| 127 |
{ |
| 128 |
- regs->AR((r1 + i) & 0xF) = fetch_fw (p1++); |
| 129 |
+ regs->AR((r1 + i) & 0xF) = fetch_fw (p1); |
| 130 |
SET_AEA_AR (regs, (r1 + i) & 0xF); |
| 131 |
} |
| 132 |
|
| 133 |
/* Copy from next page */ |
| 134 |
- for ( ; i < n; i++) |
| 135 |
+ for ( ; i < n; i++, p2++) |
| 136 |
{ |
| 137 |
- regs->AR((r1 + i) & 0xF) = fetch_fw (p2++); |
| 138 |
+ regs->AR((r1 + i) & 0xF) = fetch_fw (p2); |
| 139 |
SET_AEA_AR (regs, (r1 + i) & 0xF); |
| 140 |
} |
| 141 |
|
| 142 |
@@ -3580,8 +3583,8 @@ U32 *p1, *p2; |
| 143 |
{ |
| 144 |
/* Boundary not crossed */ |
| 145 |
n >>= 2; |
| 146 |
- for (i = 0; i < n; i++) |
| 147 |
- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++); |
| 148 |
+ for (i = 0; i < n; i++, p1++) |
| 149 |
+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1); |
| 150 |
} |
| 151 |
else |
| 152 |
{ |
| 153 |
@@ -3594,11 +3597,11 @@ U32 *p1, *p2; |
| 154 |
{ |
| 155 |
/* Addresses are word aligned */ |
| 156 |
m >>= 2; |
| 157 |
- for (i = 0; i < m; i++) |
| 158 |
- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++); |
| 159 |
+ for (i = 0; i < m; i++, p1++) |
| 160 |
+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1); |
| 161 |
n >>= 2; |
| 162 |
- for ( ; i < n; i++) |
| 163 |
- regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++); |
| 164 |
+ for ( ; i < n; i++, p2++) |
| 165 |
+ regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2); |
| 166 |
} |
| 167 |
else |
| 168 |
{ |