Skip to content
This repository was archived by the owner on Sep 15, 2022. It is now read-only.

Commit 5dfce8d

Browse files
committed
Version 0.5.0-dev.1.5
Cherry-pick 858ad88 to dev Cherry-pick 0e237c1 to dev Cherry-pick c17478e to dev Cherry-pick c477ef8 to dev
2 parents f3f682b + de8ebe6 commit 5dfce8d

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

pkg/dartino_compiler/lib/cli_debugger.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ Future<RemoteObject> _processVariable(
712712
assert(vmContext.isSpawned);
713713
assert(accesses.isNotEmpty);
714714
LocalAccess localAccess = accesses.first;
715-
int frame = vmContext.debugState.currentFrame;
715+
int frame = vmContext.debugState.actualCurrentFrameNumber;
716716
LocalValue local = await lookupValue(localAccess.localName, vmContext);
717717
if (local == null) {
718718
return new RemoteErrorObject(

pkg/dartino_compiler/lib/src/worker/developer.dart

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ Future<int> downloadTools(
12831283
Version version = parseVersion(dartinoVersion);
12841284
if (version.isEdgeVersion) {
12851285
// For edge versions download use a well known version for now.
1286-
var knownVersion = "0.3.0-dev.5.2";
1286+
var knownVersion = "0.5.0-dev.0.0";
12871287
print("WARNING: For bleeding edge tools from version "
12881288
"$knownVersion is used.");
12891289
gcsPath = "channels/dev/raw/$knownVersion/sdk";
@@ -1315,14 +1315,9 @@ Future<int> downloadTools(
13151315

13161316
// TODO(karlklose): add MacOS version
13171317
if (Platform.isLinux) {
1318-
String emul8 = "emul8-${osName}.zip";
1319-
// TODO(karlklose): remove this and the helper when we have a dev version
1320-
// archived that we can point to.
1321-
Uri temporaryPath = Uri.parse(
1322-
"https://storage.googleapis.com/dartino-temporary/channels/be/raw/"
1323-
"0.4.0-edge.8fa0e09687e17b163825f757a9a7e89e6dd8e97d/sdk/"
1324-
"emul8-linux.zip");
1325-
result = await downloadToolFromUri(temporaryPath, emul8, "Emul8");
1318+
String gccArmEmbedded = "emul8-${osName}.zip";
1319+
var result =
1320+
await downloadTool(gcsPath, gccArmEmbedded, "Emul8");
13261321
if (result != 0) return result;
13271322
}
13281323

@@ -1511,7 +1506,9 @@ Future<int> buildImage(
15111506
// Copy the .bin file from the tmp directory.
15121507
String tmpBinFile = join(tmpDir.path, "${baseName}.bin");
15131508
String binFile = "${withoutExtension(snapshot.path)}.bin";
1514-
await new File(tmpBinFile).copy(binFile);
1509+
// Use cp rather than File.copy() so that sparse files are not turned into
1510+
// non-sparse files, which costs 400Mbytes of disk use.
1511+
await Process.run("/bin/cp", [tmpBinFile, binFile]);
15151512
// Copy the .elf file from the tmp directory.
15161513
String tmpElfFile = join(tmpDir.path, "${baseName}.elf");
15171514
String elfFile = "${withoutExtension(snapshot.path)}.elf";

src/freertos/stm32f411xe-nucleo/uart_driver.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ void UartDriverImpl::EnsureTransmission() {
123123

124124
if (tx_length_ > 0) {
125125
tx_progress_ = 0;
126-
__HAL_UART_ENABLE_IT(uart_, UART_IT_TXE);
127126
tx_pending_ = true;
127+
__HAL_UART_ENABLE_IT(uart_, UART_IT_TXE);
128128
}
129129
} else {
130130
if (write_buffer_->IsFull()) {

src/freertos/stm32f746g-discovery/uart_driver.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ void UartDriverImpl::EnsureTransmission() {
122122

123123
if (tx_length_ > 0) {
124124
tx_progress_ = 0;
125-
__HAL_UART_ENABLE_IT(uart_, UART_IT_TXE);
126125
tx_pending_ = true;
126+
__HAL_UART_ENABLE_IT(uart_, UART_IT_TXE);
127127
}
128128
} else {
129129
if (write_buffer_->IsFull()) {

tests/debugger/internal_scope_expected.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ this: Instance of '_Random'
3333
* 0: main @rnd.nextInt(255)
3434
> p
3535
rnd: Instance of '_Random'
36+
> p rnd
37+
Instance of '_Random'
3638
> q

tests/debugger/internal_scope_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Disable view of internal frames.
1212
// DartinoDebuggerCommands=toggle internal
1313
// Now we should get the stack view of the top current non-internal frame(main).
14-
// DartinoDebuggerCommands=bt,p
14+
// DartinoDebuggerCommands=bt,p,p rnd
1515
// DartinoDebuggerCommands=q
1616

1717
import 'dart:math';

tools/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ MAJOR 0
3535
MINOR 5
3636
PATCH 0
3737
PRERELEASE 1
38-
PRERELEASE_PATCH 4
38+
PRERELEASE_PATCH 5

0 commit comments

Comments
 (0)