Fix __getreent stack calculations for AMD GCN

From: Andrew Stubbs <ams@codesourcery.com>

Fix a bug in which the high-part of 64-bit values are being corrupted, leading
to erroneous stack overflow errors. The problem was only that the mixed-size
calculations are being treated as signed when they should be unsigned.
This commit is contained in:
Jeff Johnston 2019-06-07 13:57:45 -04:00
parent 007bc1923c
commit eb429ad509
1 changed files with 6 additions and 6 deletions

View File

@ -35,9 +35,9 @@ __getreent (void)
s[4:5] contains the dispatch pointer.
WARNING: this code will break if s[0:3] is ever used for anything! */
const register long buffer_descriptor asm("s0");
long private_segment = buffer_descriptor & 0x0000ffffffffffff;
const register int stack_offset asm("s11");
const register unsigned long buffer_descriptor asm("s0");
unsigned long private_segment = buffer_descriptor & 0x0000ffffffffffff;
const register unsigned int stack_offset asm("s11");
const register hsa_kernel_dispatch_packet_t *dispatch_ptr asm("s4");
struct data {
@ -45,9 +45,9 @@ __getreent (void)
struct _reent reent;
} *data;
long stack_base = private_segment + stack_offset;
long stack_end = stack_base + dispatch_ptr->private_segment_size * 64;
long addr = (stack_end - sizeof(struct data)) & ~7;
unsigned long stack_base = private_segment + stack_offset;
unsigned long stack_end = stack_base + dispatch_ptr->private_segment_size * 64;
unsigned long addr = (stack_end - sizeof(struct data)) & ~7;
data = (struct data *)addr;
register long sp asm("s16");