diff options
| author | Travis Geiselbrecht <travisg@gmail.com> | 2023-06-21 15:42:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-21 15:42:35 -0700 |
| commit | 30dc320054f70910e1c1ee40a6948ee99672acec (patch) | |
| tree | fb47ab6337a71029dee71933e449cf7f6805fc0f /arch/x86/32/exceptions.S | |
| parent | 9325ca7f3b3025aafe61898d27f1c02b99426b82 (diff) | |
| parent | 3b215c398e582765ea33331369250ace997dcf98 (diff) | |
| download | lk-30dc320054f70910e1c1ee40a6948ee99672acec.tar.gz | |
[github] Merge pull request #380 from arichardson/add-clang-ci
Allow building RISCV64 and x86_64 with clang and add a Clang CI job
Diffstat (limited to 'arch/x86/32/exceptions.S')
| -rw-r--r-- | arch/x86/32/exceptions.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/32/exceptions.S b/arch/x86/32/exceptions.S index 8ca8771b..98ac81f1 100644 --- a/arch/x86/32/exceptions.S +++ b/arch/x86/32/exceptions.S @@ -21,8 +21,7 @@ _isr: .set i, 0 .rept NUM_INT -.set isr_stub_start, . - +100: /* unnamed label for start of isr stub */ .if i == 8 || (i >= 10 && i <= 14) || i == 17 nop /* error code pushed by exception */ nop /* 2 nops are the same length as push byte */ @@ -34,12 +33,12 @@ _isr: jmp interrupt_common .endif -/* figure out the length of a single isr stub (usually 6 or 9 bytes) */ -.set isr_stub_len, . - isr_stub_start - .set i, i + 1 .endr +/* figure out the length of a single isr stub (usually 6 or 9 bytes) */ +.set isr_stub_len, . - 100b + /* annoying, but force AS to use the same (longer) encoding of jmp for all of the stubs */ .fill 256 |