Skip to content

Commit 71148f1

Browse files
committed
---
yaml --- r: 548 b: refs/heads/master c: fac28ad h: refs/heads/master v: v3
1 parent 5bb0482 commit 71148f1

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 9363c1ab7f23b1a285be74a8859e1ca951283af7
2+
refs/heads/master: fac28ad42fb1c14f158774bb1bccaa2eed38cf0a

trunk/src/rt/rust_task.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
// Stacks
88

9-
static size_t const min_stk_bytes = 0x300;
9+
// FIXME (issue #151): This should be 0x300; the change here is for
10+
// practicality's sake until stack growth is working.
11+
static size_t const min_stk_bytes = 0x300000;
1012

1113
// Task stack segments. Heap allocated and chained together.
1214

@@ -200,6 +202,12 @@ rust_task::start(uintptr_t exit_task_glue,
200202
void
201203
rust_task::grow(size_t n_frame_bytes)
202204
{
205+
// FIXME (issue #151): Just fail rather than almost certainly crashing
206+
// mysteriously later. The commented-out logic below won't work at all in
207+
// the presence of non-word-aligned pointers.
208+
abort();
209+
210+
#if 0
203211
stk_seg *old_stk = this->stk;
204212
uintptr_t old_top = (uintptr_t) old_stk->limit;
205213
uintptr_t old_bottom = (uintptr_t) &old_stk->data[0];
@@ -254,6 +262,7 @@ rust_task::grow(size_t n_frame_bytes)
254262
"processed %d relocations", n_relocs);
255263
del_stk(dom, old_stk);
256264
dom->logptr("grown stk limit", new_top);
265+
#endif
257266
}
258267

259268
void

0 commit comments

Comments
 (0)