Rev 3148 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3148 | Rev 3155 | ||
|---|---|---|---|
| Line 76... | Line 76... | ||
| 76 | { |
76 | { |
| 77 | ipc_callid_t callid; |
77 | ipc_callid_t callid; |
| 78 | size_t len; |
78 | size_t len; |
| 79 | char *name_buf; |
79 | char *name_buf; |
| 80 | 80 | ||
| 81 | printf("iloader_set_pathname\n"); |
- | |
| 82 | if (!ipc_data_write_receive(&callid, &len)) { |
81 | if (!ipc_data_write_receive(&callid, &len)) { |
| 83 | ipc_answer_0(callid, EINVAL); |
82 | ipc_answer_0(callid, EINVAL); |
| 84 | ipc_answer_0(rid, EINVAL); |
83 | ipc_answer_0(rid, EINVAL); |
| 85 | return; |
84 | return; |
| 86 | } |
85 | } |
| 87 | 86 | ||
| 88 | printf("alloc %d bytes\n", len+1); |
- | |
| 89 | - | ||
| 90 | name_buf = malloc(len + 1); |
87 | name_buf = malloc(len + 1); |
| 91 | if (!name_buf) { |
88 | if (!name_buf) { |
| 92 | ipc_answer_0(callid, ENOMEM); |
89 | ipc_answer_0(callid, ENOMEM); |
| 93 | ipc_answer_0(rid, ENOMEM); |
90 | ipc_answer_0(rid, ENOMEM); |
| 94 | return; |
91 | return; |
| 95 | } |
92 | } |
| 96 | 93 | ||
| 97 | printf("write_finalize\n"); |
- | |
| 98 | ipc_data_write_finalize(callid, name_buf, len); |
94 | ipc_data_write_finalize(callid, name_buf, len); |
| 99 | printf("answer\n"); |
- | |
| 100 | ipc_answer_0(rid, EOK); |
95 | ipc_answer_0(rid, EOK); |
| 101 | 96 | ||
| 102 | if (pathname != NULL) { |
97 | if (pathname != NULL) { |
| 103 | free(pathname); |
98 | free(pathname); |
| 104 | pathname = NULL; |
99 | pathname = NULL; |
| Line 120... | Line 115... | ||
| 120 | pcb_t *pcb; |
115 | pcb_t *pcb; |
| 121 | 116 | ||
| 122 | elf_info_t prog_info; |
117 | elf_info_t prog_info; |
| 123 | elf_info_t interp_info; |
118 | elf_info_t interp_info; |
| 124 | 119 | ||
| 125 | printf("Load program '%s'\n", pathname); |
120 | // printf("Load program '%s'\n", pathname); |
| 126 | 121 | ||
| 127 | rc = elf_load_file(pathname, 0, &prog_info); |
122 | rc = elf_load_file(pathname, 0, &prog_info); |
| 128 | if (rc < 0) { |
123 | if (rc < 0) { |
| 129 | printf("failed to load program\n"); |
124 | printf("failed to load program\n"); |
| - | 125 | ipc_answer_0(rid, EINVAL); |
|
| 130 | return 1; |
126 | return 1; |
| 131 | } |
127 | } |
| 132 | 128 | ||
| 133 | printf("Create PCB\n"); |
129 | // printf("Create PCB\n"); |
| 134 | if (elf_create_pcb(&prog_info) < 0) return 1; |
130 | if (elf_create_pcb(&prog_info) < 0) { |
| - | 131 | ipc_answer_0(rid, ENOMEM); |
|
| - | 132 | return 1; |
|
| - | 133 | } |
|
| 135 | 134 | ||
| 136 | if (prog_info.interp == NULL) { |
135 | if (prog_info.interp == NULL) { |
| 137 | /* Statically linked program */ |
136 | /* Statically linked program */ |
| 138 | printf("Run statically linked program\n"); |
137 | // printf("Run statically linked program\n"); |
| - | 138 | // printf("entry point: 0x%llx\n", prog_info.entry); |
|
| - | 139 | ipc_answer_0(rid, EOK); |
|
| - | 140 | close_console(); |
|
| 139 | elf_run(&prog_info); |
141 | elf_run(&prog_info); |
| 140 | return 0; |
142 | return 0; |
| 141 | } |
143 | } |
| 142 | 144 | ||
| 143 | printf("Load dynamic linker '%s'\n", prog_info.interp); |
145 | printf("Load dynamic linker '%s'\n", prog_info.interp); |
| 144 | rc = elf_load_file("/rtld.so", RTLD_BIAS, &interp_info); |
146 | rc = elf_load_file("/rtld.so", RTLD_BIAS, &interp_info); |
| 145 | if (rc < 0) { |
147 | if (rc < 0) { |
| 146 | printf("failed to load dynamic linker\n"); |
148 | printf("failed to load dynamic linker\n"); |
| - | 149 | ipc_answer_0(rid, EINVAL); |
|
| 147 | return 1; |
150 | return 1; |
| 148 | } |
151 | } |
| 149 | 152 | ||
| 150 | /* |
153 | /* |
| 151 | * Provide dynamic linker with some useful data |
154 | * Provide dynamic linker with some useful data |
| Line 153... | Line 156... | ||
| 153 | pcb = (pcb_t *)PCB_ADDRESS; |
156 | pcb = (pcb_t *)PCB_ADDRESS; |
| 154 | pcb->rtld_dynamic = interp_info.dynamic; |
157 | pcb->rtld_dynamic = interp_info.dynamic; |
| 155 | pcb->rtld_bias = RTLD_BIAS; |
158 | pcb->rtld_bias = RTLD_BIAS; |
| 156 | 159 | ||
| 157 | printf("run dynamic linker\n"); |
160 | printf("run dynamic linker\n"); |
| - | 161 | printf("entry point: 0x%llx\n", interp_info.entry); |
|
| - | 162 | close_console(); |
|
| - | 163 | ||
| - | 164 | ipc_answer_0(rid, EOK); |
|
| 158 | elf_run(&interp_info); |
165 | elf_run(&interp_info); |
| 159 | 166 | ||
| - | 167 | /* Not reached(?) */ |
|
| 160 | return 0; |
168 | return 0; |
| 161 | } |
169 | } |
| 162 | 170 | ||
| 163 | /** Handle loader connection. |
171 | /** Handle loader connection. |
| 164 | * |
172 | * |
| Line 174... | Line 182... | ||
| 174 | /* Ignore parameters, the connection is already open */ |
182 | /* Ignore parameters, the connection is already open */ |
| 175 | (void)iid; (void)icall; |
183 | (void)iid; (void)icall; |
| 176 | 184 | ||
| 177 | while (1) { |
185 | while (1) { |
| 178 | callid = async_get_call(&call); |
186 | callid = async_get_call(&call); |
| 179 | printf("received call from phone %d, method=%d\n", |
187 | // printf("received call from phone %d, method=%d\n", |
| 180 | call.in_phone_hash, IPC_GET_METHOD(call)); |
188 | // call.in_phone_hash, IPC_GET_METHOD(call)); |
| 181 | switch (IPC_GET_METHOD(call)) { |
189 | switch (IPC_GET_METHOD(call)) { |
| 182 | case LOADER_SET_PATHNAME: |
190 | case LOADER_SET_PATHNAME: |
| 183 | iloader_set_pathname(callid, &call); |
191 | iloader_set_pathname(callid, &call); |
| 184 | continue; |
192 | continue; |
| 185 | case LOADER_RUN: |
193 | case LOADER_RUN: |