Changeset a35b458 in mainline for kernel/arch/amd64/src/interrupt.c


Ignore:
Timestamp:
2018-03-02T20:10:49Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f1380b7
Parents:
3061bc1
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)
Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/src/interrupt.c

    r3061bc1 ra35b458  
    7070            "rfl=%0#18" PRIx64 "\terr=%0#18" PRIx64 "\n",
    7171            istate->cs, istate->rip, istate->rflags, istate->error_word);
    72        
     72
    7373        if (istate_from_uspace(istate))
    7474                log_printf("ss =%0#18" PRIx64 "\n", istate->ss);
    75        
     75
    7676        log_printf("rax=%0#18" PRIx64 "\trbx=%0#18" PRIx64 "\t"
    7777            "rcx=%0#18" PRIx64 "\trdx=%0#18" PRIx64 "\n",
    7878            istate->rax, istate->rbx, istate->rcx, istate->rdx);
    79        
     79
    8080        log_printf("rsi=%0#18" PRIx64 "\trdi=%0#18" PRIx64 "\t"
    8181            "rbp=%0#18" PRIx64 "\trsp=%0#18" PRIx64 "\n",
     
    8383            istate_from_uspace(istate) ? istate->rsp :
    8484            (uintptr_t) &istate->rsp);
    85        
     85
    8686        log_printf("r8 =%0#18" PRIx64 "\tr9 =%0#18" PRIx64 "\t"
    8787            "r10=%0#18" PRIx64 "\tr11=%0#18" PRIx64 "\n",
    8888            istate->r8, istate->r9, istate->r10, istate->r11);
    89        
     89
    9090        log_printf("r12=%0#18" PRIx64 "\tr13=%0#18" PRIx64 "\t"
    9191            "r14=%0#18" PRIx64 "\tr15=%0#18" PRIx64 "\n",
     
    123123                size_t ver = TASK->arch.iomapver;
    124124                irq_spinlock_unlock(&TASK->lock, false);
    125                
     125
    126126                if (CPU->arch.iomapver_copy != ver) {
    127127                        /*
     
    176176{
    177177        assert(n >= IVT_IRQBASE);
    178        
     178
    179179        unsigned int inum = n - IVT_IRQBASE;
    180180        bool ack = false;
    181181        assert(inum < IRQ_COUNT);
    182182        assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
    183        
     183
    184184        irq_t *irq = irq_dispatch_and_lock(inum);
    185185        if (irq) {
     
    187187                 * The IRQ handler was found.
    188188                 */
    189                
     189
    190190                if (irq->preack) {
    191191                        /* Send EOI before processing the interrupt */
     
    204204#endif
    205205        }
    206        
     206
    207207        if (!ack)
    208208                trap_virtual_eoi();
     
    212212{
    213213        unsigned int i;
    214        
     214
    215215        for (i = 0; i < IVT_ITEMS; i++)
    216216                exc_register(i, "null", false, (iroutine_t) null_interrupt);
    217        
     217
    218218        for (i = 0; i < IRQ_COUNT; i++) {
    219219                if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
     
    221221                            (iroutine_t) irq_interrupt);
    222222        }
    223        
     223
    224224        exc_register(VECTOR_DE, "de_fault", true, (iroutine_t) de_fault);
    225225        exc_register(VECTOR_NM, "nm_fault", true, (iroutine_t) nm_fault);
    226226        exc_register(VECTOR_SS, "ss_fault", true, (iroutine_t) ss_fault);
    227227        exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault);
    228        
     228
    229229#ifdef CONFIG_SMP
    230230        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true,
Note: See TracChangeset for help on using the changeset viewer.