| @@ -321,6 +321,7 @@ static void gcall_or_jmp(int is_jmp) · 320 unmodified lines |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | static uint8_t fastcall_regs[3] = { TREG_EAX, TREG_EDX, TREG_ECX }; |
| 324 | +static uint8_t fastcallw_regs[2] = { TREG_ECX, TREG_EDX }; |
| 324 | 325 | |
| 325 | 326 | /* Generate function call. The function address is pushed first, then |
| 326 | 327 | all the parameters in call order. This functions pops all the |
| @@ -381,13 +382,21 @@ void gfunc_call(int nb_args) · 54 unmodified lines |
| 381 | 382 | func_sym = vtop->type.ref; |
| 382 | 383 | func_call = func_sym->r; |
| 383 | 384 | /* fast call case */ |
| 384 | | − if (func_call >= FUNC_FASTCALL1 && func_call <= FUNC_FASTCALL3) { |
| 385 | + if ((func_call >= FUNC_FASTCALL1 && func_call <= FUNC_FASTCALL3) || |
| 386 | + func_call == FUNC_FASTCALLW) { |
| 385 | 387 | int fastcall_nb_regs; |
| 386 | | − fastcall_nb_regs = func_call - FUNC_FASTCALL1 + 1; |
| 388 | + uint8_t *fastcall_regs_ptr; |
| 389 | + if (func_call == FUNC_FASTCALLW) { |
| 390 | + fastcall_regs_ptr = fastcallw_regs; |
| 391 | + fastcall_nb_regs = 2; |
| 392 | + } else { |
| 393 | + fastcall_regs_ptr = fastcall_regs; |
| 394 | + fastcall_nb_regs = func_call - FUNC_FASTCALL1 + 1; |
| 395 | + } |
| 387 | 396 | for(i = 0;i < fastcall_nb_regs; i++) { |
| 388 | 397 | if (args_size <= 0) |
| 389 | 398 | break; |
| 390 | | − o(0x58 + fastcall_regs[i]); /* pop r */ |
| 399 | + o(0x58 + fastcall_regs_ptr[i]); /* pop r */ |
| 391 | 400 | /* XXX: incorrect for struct/floats */ |
| 392 | 401 | args_size -= 4; |
| 393 | 402 | } |
| @@ -409,6 +418,7 @@ void gfunc_prolog(CType *func_type) · 15 unmodified lines |
| 409 | 418 | { |
| 410 | 419 | int addr, align, size, func_call, fastcall_nb_regs; |
| 411 | 420 | int param_index, param_addr; |
| 421 | + uint8_t *fastcall_regs_ptr; |
| 412 | 422 | Sym *sym; |
| 413 | 423 | CType *type; |
| 414 | 424 | |
| @@ -418,8 +428,13 @@ void gfunc_prolog(CType *func_type) · 3 unmodified lines |
| 418 | 428 | loc = 0; |
| 419 | 429 | if (func_call >= FUNC_FASTCALL1 && func_call <= FUNC_FASTCALL3) { |
| 420 | 430 | fastcall_nb_regs = func_call - FUNC_FASTCALL1 + 1; |
| 431 | + fastcall_regs_ptr = fastcall_regs; |
| 432 | + } else if (func_call == FUNC_FASTCALLW) { |
| 433 | + fastcall_nb_regs = 2; |
| 434 | + fastcall_regs_ptr = fastcallw_regs; |
| 421 | 435 | } else { |
| 422 | 436 | fastcall_nb_regs = 0; |
| 437 | + fastcall_regs_ptr = NULL; |
| 423 | 438 | } |
| 424 | 439 | param_index = 0; |
| 425 | 440 | |
| @@ -449,7 +464,7 @@ void gfunc_prolog(CType *func_type) · 23 unmodified lines |
| 449 | 464 | /* save FASTCALL register */ |
| 450 | 465 | loc -= 4; |
| 451 | 466 | o(0x89); /* movl */ |
| 452 | | − gen_modrm(fastcall_regs[param_index], VT_LOCAL, NULL, loc); |
| 467 | + gen_modrm(fastcall_regs_ptr[param_index], VT_LOCAL, NULL, loc); |
| 453 | 468 | param_addr = loc; |
| 454 | 469 | } else { |
| 455 | 470 | param_addr = addr; |