Changeset a35b458 in mainline for kernel/arch/ia32/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/ia32/src/interrupt.c

    r3061bc1 ra35b458  
    7272            "efl=%0#10" PRIx32 "\terr=%0#10" PRIx32 "\n",
    7373            istate->cs, istate->eip, istate->eflags, istate->error_word);
    74        
     74
    7575        printf("ds =%0#10" PRIx32 "\tes =%0#10" PRIx32 "\t"
    7676            "fs =%0#10" PRIx32 "\tgs =%0#10" PRIx32 "\n",
    7777            istate->ds, istate->es, istate->fs, istate->gs);
    78        
     78
    7979        if (istate_from_uspace(istate))
    8080                printf("ss =%0#10" PRIx32 "\n", istate->ss);
    81        
     81
    8282        printf("eax=%0#10" PRIx32 "\tebx=%0#10" PRIx32 "\t"
    8383            "ecx=%0#10" PRIx32 "\tedx=%0#10" PRIx32 "\n",
    8484            istate->eax, istate->ebx, istate->ecx, istate->edx);
    85        
     85
    8686        printf("esi=%0#10" PRIx32 "\tedi=%0#10" PRIx32 "\t"
    8787            "ebp=%0#10" PRIx32 "\tesp=%0#10" PRIxn "\n",
     
    119119                size_t ver = TASK->arch.iomapver;
    120120                irq_spinlock_unlock(&TASK->lock, false);
    121                
     121
    122122                if (CPU->arch.iomapver_copy != ver) {
    123123                        /*
     
    149149                : [mxcsr] "=m" (mxcsr)
    150150        );
    151        
     151
    152152        fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0" PRIx32 ".",
    153153            mxcsr);
     
    185185{
    186186        assert(n >= IVT_IRQBASE);
    187        
     187
    188188        unsigned int inum = n - IVT_IRQBASE;
    189189        bool ack = false;
    190190        assert(inum < IRQ_COUNT);
    191191        assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
    192        
     192
    193193        irq_t *irq = irq_dispatch_and_lock(inum);
    194194        if (irq) {
     
    196196                 * The IRQ handler was found.
    197197                 */
    198                
     198
    199199                if (irq->preack) {
    200200                        /* Send EOI before processing the interrupt */
     
    212212#endif
    213213        }
    214        
     214
    215215        if (!ack)
    216216                trap_virtual_eoi();
     
    220220{
    221221        unsigned int i;
    222        
     222
    223223        for (i = 0; i < IVT_ITEMS; i++)
    224224                exc_register(i, "null", false, (iroutine_t) null_interrupt);
    225        
     225
    226226        for (i = 0; i < IRQ_COUNT; i++) {
    227227                if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1))
     
    229229                            (iroutine_t) irq_interrupt);
    230230        }
    231        
     231
    232232        exc_register(VECTOR_DE, "de_fault", true, (iroutine_t) de_fault);
    233233        exc_register(VECTOR_NM, "nm_fault", true, (iroutine_t) nm_fault);
     
    235235        exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault);
    236236        exc_register(VECTOR_XM, "simd_fp", true, (iroutine_t) simd_fp_exception);
    237        
     237
    238238#ifdef CONFIG_SMP
    239239        exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true,
Note: See TracChangeset for help on using the changeset viewer.