Merge branch 'master' of git://factorcode.org/git/factor
						commit
						88e31112a4
					
				| 
						 | 
				
			
			@ -6,7 +6,7 @@ F_FASTCALL void save_callstack_bottom(F_STACK_FRAME *callstack_bottom)
 | 
			
		|||
	stack_chain->callstack_bottom = callstack_bottom;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
__attribute__((noinline)) void save_callstack_top(F_STACK_FRAME *callstack_top)
 | 
			
		||||
F_FASTCALL __attribute__((noinline)) void save_callstack_top(F_STACK_FRAME *callstack_top)
 | 
			
		||||
{
 | 
			
		||||
	stack_chain->callstack_top = callstack_top;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
F_FASTCALL void save_callstack_bottom(F_STACK_FRAME *callstack_bottom);
 | 
			
		||||
__attribute__((noinline)) void save_callstack_top(F_STACK_FRAME *callstack_top);
 | 
			
		||||
F_FASTCALL __attribute__((noinline)) void save_callstack_top(F_STACK_FRAME *callstack_top);
 | 
			
		||||
 | 
			
		||||
#define FIRST_STACK_FRAME(stack) (F_STACK_FRAME *)((stack) + 1)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,7 +29,7 @@ long exception_handler(PEXCEPTION_POINTERS pe)
 | 
			
		|||
	CONTEXT *c = (CONTEXT*)pe->ContextRecord;
 | 
			
		||||
 | 
			
		||||
	if(in_code_heap_p(c->Eip))
 | 
			
		||||
		signal_callstack_top = (void*)c->Esp;
 | 
			
		||||
		signal_callstack_top = (void *)(c->Esp - CELLS);
 | 
			
		||||
	else
 | 
			
		||||
		signal_callstack_top = NULL;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue