Skip to content

Commit ea2c821

Browse files
committed
---
yaml --- r: 14149 b: refs/heads/try c: 2983e77 h: refs/heads/master i: 14147: 2163b32 v: v3
1 parent f86ae35 commit ea2c821

File tree

3 files changed

+1
-29
lines changed

3 files changed

+1
-29
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: b778dac1976c3d4f33bf8ee8c7c3208ca8af2563
5+
refs/heads/try: 2983e77383edd852bb30a022e4599e7c42670ac5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/arch/i386/context.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,6 @@ class context {
4141

4242
void swap(context &out);
4343
void call(void *f, void *arg, void *sp);
44-
void call(void *f, void *sp);
45-
46-
// Note that this doesn't actually adjust esp. Instead, we adjust esp when
47-
// we actually do the call. This is needed for exception safety -- if the
48-
// function being called causes the task to fail, then we have to avoid
49-
// leaking space on the C stack.
50-
inline void *alloc_stack(size_t nbytes) {
51-
uint32_t bot = regs.esp;
52-
uint32_t top = align_down(bot - nbytes);
53-
54-
(void)VALGRIND_MAKE_MEM_UNDEFINED(top - 4, bot - top + 4);
55-
56-
return reinterpret_cast<void *>(top);
57-
}
5844

5945
void call_shim_on_c_stack(void *args, void *fn_ptr) {
6046
__morestack(args, fn_ptr, regs.esp);

branches/try/src/rt/arch/x86_64/context.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,6 @@ class context {
4040

4141
void swap(context &out);
4242
void call(void *f, void *arg, void *sp);
43-
void call(void *f, void *sp);
44-
45-
// Note that this doesn't actually adjust esp. Instead, we adjust esp when
46-
// we actually do the call. This is needed for exception safety -- if the
47-
// function being called causes the task to fail, then we have to avoid
48-
// leaking space on the C stack.
49-
inline void *alloc_stack(size_t nbytes) {
50-
uint64_t bot = regs.data[RUSTRT_RSP];
51-
uint64_t top = align_down(bot - nbytes);
52-
53-
(void)VALGRIND_MAKE_MEM_UNDEFINED(top - 4, bot - top + 4);
54-
55-
return reinterpret_cast<void *>(top);
56-
}
5743

5844
void call_shim_on_c_stack(void *args, void *fn_ptr) {
5945
__morestack(args, fn_ptr, regs.data[RUSTRT_RSP]);

0 commit comments

Comments
 (0)