Rev 3400 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3400 | Rev 3552 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (c) 2008 Jiri Svoboda |
2 | * Copyright (c) 2008 Jiri Svoboda |
3 | * All rights reserved. |
3 | * All rights reserved. |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
7 | * are met: |
7 | * are met: |
8 | * |
8 | * |
9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
16 | * |
16 | * |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | /** @addtogroup rtld rtld |
29 | /** @addtogroup rtld rtld |
30 | * @brief |
30 | * @brief |
31 | * @{ |
31 | * @{ |
32 | */ |
32 | */ |
33 | /** |
33 | /** |
34 | * @file |
34 | * @file |
35 | */ |
35 | */ |
36 | 36 | ||
37 | #include <sys/types.h> |
37 | #include <sys/types.h> |
38 | #include <align.h> |
38 | #include <align.h> |
39 | #include <tls.h> |
39 | #include <tls.h> |
40 | 40 | ||
41 | static void kputint(unsigned i) |
41 | static void kputint(unsigned i) |
42 | { |
42 | { |
43 | // unsigned dummy; |
43 | // unsigned dummy; |
44 | // asm volatile ( |
44 | // asm volatile ( |
45 | // "movl $31, %%eax;" |
45 | // "movl $31, %%eax;" |
46 | // "int $0x30" |
46 | // "int $0x30" |
47 | // : "=d" (dummy) /* output - %edx clobbered */ |
47 | // : "=d" (dummy) /* output - %edx clobbered */ |
48 | // : "d" (i) /* input */ |
48 | // : "d" (i) /* input */ |
49 | // : "%eax","%ecx" /* all scratch registers clobbered */ |
49 | // : "%eax","%ecx" /* all scratch registers clobbered */ |
50 | // ); |
50 | // ); |
51 | } |
51 | } |
52 | 52 | ||
53 | typedef struct { |
53 | typedef struct { |
54 | unsigned long int ti_module; |
54 | unsigned long int ti_module; |
55 | unsigned long int ti_offset; |
55 | unsigned long int ti_offset; |
56 | } tls_index; |
56 | } tls_index; |
57 | 57 | ||
58 | void __attribute__ ((__regparm__ (1))) |
58 | void __attribute__ ((__regparm__ (1))) |
59 | *___tls_get_addr(tls_index *ti); |
59 | *___tls_get_addr(tls_index *ti); |
60 | 60 | ||
61 | void __attribute__ ((__regparm__ (1))) |
61 | //void __attribute__ ((__regparm__ (1))) |
62 | *___tls_get_addr(tls_index *ti) |
62 | // *___tls_get_addr(tls_index *ti) |
63 | { |
63 | //{ |
64 | size_t tls_size; |
64 | // size_t tls_size; |
65 | uint8_t *tls; |
65 | // uint8_t *tls; |
66 | 66 | // |
|
67 | /* Calculate size of TLS block */ |
67 | // /* Calculate size of TLS block */ |
68 | tls_size = ALIGN_UP(&_tbss_end - &_tdata_start, &_tls_alignment); |
68 | // tls_size = ALIGN_UP(&_tbss_end - &_tdata_start, &_tls_alignment); |
69 | 69 | // |
|
70 | /* The TLS block is just before TCB */ |
70 | // /* The TLS block is just before TCB */ |
71 | tls = (uint8_t *)__tcb_get() - tls_size; |
71 | // tls = (uint8_t *)__tcb_get() - tls_size; |
72 | 72 | // |
|
73 | return tls + ti->ti_offset; |
73 | // return tls + ti->ti_offset; |
74 | } |
74 | //} |
75 | 75 | ||
76 | /** @} |
76 | /** @} |
77 | */ |
77 | */ |
78 | 78 |