Fixed constant set issues

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7811 8c9fc860-2736-0410-a75d-ab315db34111

source/JPEG2000Decoder.Mod

@@ -2320,7 +2320,7 @@ MODULE JPEG2000Decoder;
 							END;
 
 							(* Set coefficients back to not visited *)
-							state[stateIdx] := curState * (-(STATE_VISITED_R1 + STATE_VISITED_R2));
+							state[stateIdx] := curState * SET (-(STATE_VISITED_R1 + STATE_VISITED_R2));
 
 							(* Scan 3rd row *)
 							INC(stateIdx, rowWidthState);
@@ -2456,7 +2456,7 @@ MODULE JPEG2000Decoder;
 							END;
 
 							(* Set coefficients back to not visited *)
-							state[stateIdx] := curState * (-(STATE_VISITED_R1 + STATE_VISITED_R2));
+							state[stateIdx] := curState * SET(-(STATE_VISITED_R1 + STATE_VISITED_R2));
 						END;
 
 						(* Move to next row of stripes *)
@@ -2621,7 +2621,7 @@ MODULE JPEG2000Decoder;
 
 							mask3 := SYSTEM.VAL(SET, LSH(J2KU.SWAP_MASK, (J2KU.LONGINT_BITS - 1)- magBits));
 							mask2 := -mask3;
-							mask1 := mask3 * (-J2KU.LONGINT_SIGN_BIT);
+							mask1 := mask3 * SET(-J2KU.LONGINT_SIGN_BIT);
 							approx := SYSTEM.VAL(SET, LSH(SYSTEM.VAL(LONGINT, 1), (J2KU.LONGINT_BITS - 2) - magBits));
 
 							(* For every coefficient see if it belongs to the background or a ROI *)
@@ -7162,4 +7162,4 @@ END JPEG2000Decoder.
 
 SystemTools.Free JPEG2000Decoder~
 SystemTools.Free JPEG2000DecoderCS~
-SystemTools.Free JPEG2000Util~
+SystemTools.Free JPEG2000Util~

source/PCOARM.Mod

@@ -757,10 +757,10 @@ BEGIN
 END Dump;
 
 BEGIN
-	AddrMode[0] := - {};
-	AddrMode[1] := - {};
-	AddrMode[2] := - {};
+	AddrMode[0] := { 0 .. 31 };
+	AddrMode[1] := { 0 .. 31 };
+	AddrMode[2] := { 0 .. 31 };
 	AddrMode[3] := { 24, 23 };
-	AddrMode[4] := - {};
+	AddrMode[4] := { 0 .. 31 };
 	SetConstantPoolBarrier(-1)
 END PCOARM.