diff --git a/templates/chapter_20_templates/alignment_check_wrapper.s.jinja b/templates/chapter_20_templates/alignment_check_wrapper.s.jinja index edbcb3ba..10bd8040 100644 --- a/templates/chapter_20_templates/alignment_check_wrapper.s.jinja +++ b/templates/chapter_20_templates/alignment_check_wrapper.s.jinja @@ -1,9 +1,9 @@ {% extends "includes/wrapper_base.s.jinja" %} {% block call %} # call test functions, all of which exit early on failure - callq test1 - callq test2 - callq test3 + callq {{id_prefix}}test1 + callq {{id_prefix}}test2 + callq {{id_prefix}}test3 {% endblock %} {% block more_functions %} .text @@ -21,7 +21,7 @@ je {{local_prefix}}_OK # it's not zero; exit # using exit code already in EDI - call exit@PLT + call {{id_prefix}}exit{{plt_suffix}} {{local_prefix}}_OK: # success; rsp is aligned correctly movl $0, %eax diff --git a/tests/chapter_20/libraries/alignment_check_wrapper_osx.s b/tests/chapter_20/libraries/alignment_check_wrapper_osx.s index 83d5aef4..c60dac08 100644 --- a/tests/chapter_20/libraries/alignment_check_wrapper_osx.s +++ b/tests/chapter_20/libraries/alignment_check_wrapper_osx.s @@ -34,9 +34,9 @@ _main: movq $-4, %r14 movq $-5, %r15 # call test functions, all of which exit early on failure - callq test1 - callq test2 - callq test3 + callq _test1 + callq _test2 + callq _test3 # make sure values of callee-saved regs were preserved cmpq $-1, %rbx jne Lfail @@ -82,7 +82,7 @@ _check_alignment: je L_OK # it's not zero; exit # using exit code already in EDI - call exit@PLT + call _exit L_OK: # success; rsp is aligned correctly movl $0, %eax