|
@@ -926,7 +926,7 @@ MODULE O7ARMv7MLinker;
|
|
|
(*Oberon.Collect(0)*)
|
|
|
END Link;
|
|
|
|
|
|
- PROCEDURE EnterNXP ((*IN*) name: TargetName; maxExtInts, flashSize, SRAMSize, IAPReserve: INTEGER);
|
|
|
+ PROCEDURE EnterNXP ((*IN*) name: ARRAY OF CHAR; maxExtInts, flashSize, SRAMSize, IAPReserve: INTEGER);
|
|
|
VAR target: Target;
|
|
|
BEGIN
|
|
|
ASSERT(maxExtInts > 0, 20);
|
|
@@ -935,7 +935,7 @@ MODULE O7ARMv7MLinker;
|
|
|
ASSERT(SRAMSize MOD 4 = 0, 23);
|
|
|
|
|
|
NEW(target); target.next := targets; targets := target;
|
|
|
- target.name := name;
|
|
|
+ (* target.name := name; *) COPY(name, target.name);
|
|
|
target.isNXP := TRUE;
|
|
|
target.flashStart := 0;
|
|
|
target.maxExtInts := maxExtInts;
|
|
@@ -962,7 +962,7 @@ MODULE O7ARMv7MLinker;
|
|
|
j := 0;
|
|
|
WHILE j < StrLen(fpo1) DO
|
|
|
NEW(target); target.next := targets; targets := target;
|
|
|
- target.name := name0(*$*); k := StrLen(target.name);
|
|
|
+ (* target.name := name0(*$*); *) COPY(name0, target.name); k := StrLen(target.name);
|
|
|
target.name[k] := fpo0[i]; INC(k);
|
|
|
target.name[k] := fpo1[j]; INC(k);
|
|
|
l := 0;
|
|
@@ -995,7 +995,7 @@ MODULE O7ARMv7MLinker;
|
|
|
END EnterSTM;
|
|
|
|
|
|
(* Cortex-M3 *)
|
|
|
- PROCEDURE EnterCC1310 ((*IN*) name: TargetName; flashSize, SRAMSize: INTEGER);
|
|
|
+ PROCEDURE EnterCC1310 ((*IN*) name: ARRAY OF CHAR; flashSize, SRAMSize: INTEGER);
|
|
|
CONST
|
|
|
maxExtInts = 34;
|
|
|
CCFGSize = 88;
|
|
@@ -1004,7 +1004,7 @@ MODULE O7ARMv7MLinker;
|
|
|
ASSERT(SRAMSize MOD 4 = 0, 21);
|
|
|
|
|
|
NEW(target); target.next := targets; targets := target;
|
|
|
- target.name := name;
|
|
|
+ (* target.name := name; *) COPY(name, target.name);
|
|
|
target.isNXP := FALSE;
|
|
|
target.flashStart := 0;
|
|
|
target.maxExtInts := maxExtInts;
|
|
@@ -1015,7 +1015,7 @@ MODULE O7ARMv7MLinker;
|
|
|
END EnterCC1310;
|
|
|
|
|
|
(* Cortex-M3 *)
|
|
|
- PROCEDURE EnterLM3S ((*IN*) name: TargetName; flashSize, SRAMSize: INTEGER; maxExtInts: INTEGER);
|
|
|
+ PROCEDURE EnterLM3S ((*IN*) name: ARRAY OF CHAR; flashSize, SRAMSize: INTEGER; maxExtInts: INTEGER);
|
|
|
BEGIN
|
|
|
ASSERT(flashSize MOD 4 = 0, 20);
|
|
|
ASSERT(SRAMSize MOD 4 = 0, 21);
|
|
@@ -1023,7 +1023,7 @@ MODULE O7ARMv7MLinker;
|
|
|
ASSERT(maxExtInts <= 240 (* Cortex-M4 *), 23);
|
|
|
|
|
|
NEW(target); target.next := targets; targets := target;
|
|
|
- target.name := name;
|
|
|
+ (* target.name := name; *) COPY(name, target.name);
|
|
|
target.isNXP := FALSE;
|
|
|
target.flashStart := 0;
|
|
|
target.maxExtInts := maxExtInts;
|
|
@@ -1051,7 +1051,7 @@ MODULE O7ARMv7MLinker;
|
|
|
i := 0;
|
|
|
WHILE i < StrLen(fpo0) DO
|
|
|
NEW(target); target.next := targets; targets := target;
|
|
|
- target.name := name0(*$*); k := StrLen(target.name);
|
|
|
+ (* target.name := name0(*$*); *) COPY(name0, target.name); k := StrLen(target.name);
|
|
|
target.name[k] := fpo0[i]; INC(k);
|
|
|
target.name[k] := 0X;
|
|
|
target.isNXP := FALSE;
|