正在显示
3 个修改的文件
包含
1 行增加
和
35 行删除
| @@ -144,9 +144,6 @@ typedef struct _st_stack { | @@ -144,9 +144,6 @@ typedef struct _st_stack { | ||
| 144 | char *stk_bottom; /* Lowest address of stack's usable portion */ | 144 | char *stk_bottom; /* Lowest address of stack's usable portion */ |
| 145 | char *stk_top; /* Highest address of stack's usable portion */ | 145 | char *stk_top; /* Highest address of stack's usable portion */ |
| 146 | void *sp; /* Stack pointer from C's point of view */ | 146 | void *sp; /* Stack pointer from C's point of view */ |
| 147 | - #ifdef __ia64__ | ||
| 148 | - void *bsp; /* Register stack backing store pointer */ | ||
| 149 | - #endif | ||
| 150 | } _st_stack_t; | 147 | } _st_stack_t; |
| 151 | 148 | ||
| 152 | 149 | ||
| @@ -349,11 +346,7 @@ extern _st_eventsys_t *_st_eventsys; | @@ -349,11 +346,7 @@ extern _st_eventsys_t *_st_eventsys; | ||
| 349 | #define ST_UTIME_NO_TIMEOUT ((st_utime_t) -1LL) | 346 | #define ST_UTIME_NO_TIMEOUT ((st_utime_t) -1LL) |
| 350 | #endif | 347 | #endif |
| 351 | 348 | ||
| 352 | -#ifndef __ia64__ | ||
| 353 | - #define ST_DEFAULT_STACK_SIZE (64*1024) | ||
| 354 | -#else | ||
| 355 | - #define ST_DEFAULT_STACK_SIZE (128*1024) /* Includes register stack size */ | ||
| 356 | -#endif | 349 | +#define ST_DEFAULT_STACK_SIZE (64*1024) |
| 357 | 350 | ||
| 358 | #ifndef ST_KEYS_MAX | 351 | #ifndef ST_KEYS_MAX |
| 359 | #define ST_KEYS_MAX 16 | 352 | #define ST_KEYS_MAX 16 |
| @@ -532,9 +532,6 @@ _st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinabl | @@ -532,9 +532,6 @@ _st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinabl | ||
| 532 | _st_stack_t *stack; | 532 | _st_stack_t *stack; |
| 533 | void **ptds; | 533 | void **ptds; |
| 534 | char *sp; | 534 | char *sp; |
| 535 | -#ifdef __ia64__ | ||
| 536 | - char *bsp; | ||
| 537 | -#endif | ||
| 538 | 535 | ||
| 539 | /* Adjust stack size */ | 536 | /* Adjust stack size */ |
| 540 | if (stk_size == 0) { | 537 | if (stk_size == 0) { |
| @@ -549,22 +546,6 @@ _st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinabl | @@ -549,22 +546,6 @@ _st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinabl | ||
| 549 | /* Allocate thread object and per-thread data off the stack */ | 546 | /* Allocate thread object and per-thread data off the stack */ |
| 550 | #if defined (MD_STACK_GROWS_DOWN) | 547 | #if defined (MD_STACK_GROWS_DOWN) |
| 551 | sp = stack->stk_top; | 548 | sp = stack->stk_top; |
| 552 | - #ifdef __ia64__ | ||
| 553 | - /* | ||
| 554 | - * The stack segment is split in the middle. The upper half is used | ||
| 555 | - * as backing store for the register stack which grows upward. | ||
| 556 | - * The lower half is used for the traditional memory stack which | ||
| 557 | - * grows downward. Both stacks start in the middle and grow outward | ||
| 558 | - * from each other. | ||
| 559 | - */ | ||
| 560 | - sp -= (stk_size >> 1); | ||
| 561 | - bsp = sp; | ||
| 562 | - /* Make register stack 64-byte aligned */ | ||
| 563 | - if ((unsigned long)bsp & 0x3f) { | ||
| 564 | - bsp = bsp + (0x40 - ((unsigned long)bsp & 0x3f)); | ||
| 565 | - } | ||
| 566 | - stack->bsp = bsp + _ST_STACK_PAD_SIZE; | ||
| 567 | - #endif | ||
| 568 | sp = sp - (ST_KEYS_MAX * sizeof(void *)); | 549 | sp = sp - (ST_KEYS_MAX * sizeof(void *)); |
| 569 | ptds = (void **) sp; | 550 | ptds = (void **) sp; |
| 570 | sp = sp - sizeof(_st_thread_t); | 551 | sp = sp - sizeof(_st_thread_t); |
| @@ -600,11 +581,7 @@ _st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinabl | @@ -600,11 +581,7 @@ _st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinabl | ||
| 600 | thread->start = start; | 581 | thread->start = start; |
| 601 | thread->arg = arg; | 582 | thread->arg = arg; |
| 602 | 583 | ||
| 603 | -#ifndef __ia64__ | ||
| 604 | _ST_INIT_CONTEXT(thread, stack->sp, _st_thread_main); | 584 | _ST_INIT_CONTEXT(thread, stack->sp, _st_thread_main); |
| 605 | -#else | ||
| 606 | - _ST_INIT_CONTEXT(thread, stack->sp, stack->bsp, _st_thread_main); | ||
| 607 | -#endif | ||
| 608 | 585 | ||
| 609 | /* If thread is joinable, allocate a termination condition variable */ | 586 | /* If thread is joinable, allocate a termination condition variable */ |
| 610 | if (joinable) { | 587 | if (joinable) { |
| @@ -11,10 +11,6 @@ | @@ -11,10 +11,6 @@ | ||
| 11 | 11 | ||
| 12 | #include "public.h" | 12 | #include "public.h" |
| 13 | 13 | ||
| 14 | -#if defined(__ia64__) | ||
| 15 | - #error "IA64 not supported" | ||
| 16 | -#endif | ||
| 17 | - | ||
| 18 | #define srs_trace(msg, ...) printf(msg, ##__VA_ARGS__);printf("\n") | 14 | #define srs_trace(msg, ...) printf(msg, ##__VA_ARGS__);printf("\n") |
| 19 | 15 | ||
| 20 | int io_port = 1990; | 16 | int io_port = 1990; |
-
请 注册 或 登录 后发表评论