Commit 23adcf7e authored by Jason Wang's avatar Jason Wang Committed by Marcelo Tosatti
Browse files

Remove trailing whitespaces


Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent c3bfa6e1
......@@ -32,18 +32,18 @@ tests_and_config = $(TEST_DIR)/*.flat $(TEST_DIR)/unittests.cfg
test_cases: $(tests-common) $(tests)
$(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding -I lib -I lib/x86
$(TEST_DIR)/access.flat: $(cstart.o) $(TEST_DIR)/access.o $(TEST_DIR)/print.o
$(TEST_DIR)/hypercall.flat: $(cstart.o) $(TEST_DIR)/hypercall.o
$(TEST_DIR)/sieve.flat: $(cstart.o) $(TEST_DIR)/sieve.o \
$(TEST_DIR)/vm.o
$(TEST_DIR)/vmexit.flat: $(cstart.o) $(TEST_DIR)/vmexit.o
$(TEST_DIR)/smptest.flat: $(cstart.o) $(TEST_DIR)/smptest.o
$(TEST_DIR)/emulator.flat: $(cstart.o) $(TEST_DIR)/emulator.o \
$(TEST_DIR)/vm.o $(TEST_DIR)/print.o \
$(TEST_DIR)/idt.o
......@@ -53,7 +53,7 @@ $(TEST_DIR)/port80.flat: $(cstart.o) $(TEST_DIR)/port80.o
$(TEST_DIR)/tsc.flat: $(cstart.o) $(TEST_DIR)/tsc.o
$(TEST_DIR)/apic.flat: $(cstart.o) $(TEST_DIR)/apic.o $(TEST_DIR)/vm.o \
$(TEST_DIR)/print.o
$(TEST_DIR)/print.o
$(TEST_DIR)/realmode.flat: $(TEST_DIR)/realmode.o
$(CC) -m32 -nostdlib -o $@ -Wl,-T,$(TEST_DIR)/realmode.lds $^
......
......@@ -157,7 +157,7 @@ static void ac_test_show(ac_test_t *at);
void lidt(idt_entry_t *idt, int nentries)
{
descriptor_table_t dt;
dt.limit = nentries * sizeof(*idt) - 1;
dt.linear_addr = (unsigned long)idt;
asm volatile ("lidt %0" : : "m"(dt));
......
......@@ -19,7 +19,7 @@ stacktop:
ring0stacktop:
.data
.align 4096
ptl2:
i = 0
......@@ -38,7 +38,7 @@ ptl3:
.align 4096
ptl4:
.quad ptl3 + 7
.align 4096
gdt64_desc:
......
......@@ -3,12 +3,12 @@
#define PSEUDO_SERIAL_PORT 0xf1
.text
PRINT "boo"
hlt
1: jmp 1b
.globl print
print:
push %rax
......@@ -24,7 +24,7 @@ putchar:
outsb
jmp putchar
done:
pop %rdx
pop %rsi
pop %rax
......
......@@ -46,6 +46,6 @@ int main()
test_sieve("virtual", v, VSIZE);
vfree(v);
}
return 0;
}
......@@ -30,7 +30,7 @@ void *alloc_page()
if (!free)
return 0;
p = free;
free = *(void **)free;
......@@ -184,7 +184,7 @@ void *vmalloc(unsigned long size)
unsigned pages;
size += sizeof(unsigned long);
size = (size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
vfree_top -= size;
mem = p = vfree_top;
......@@ -201,7 +201,7 @@ void *vmalloc(unsigned long size)
void vfree(void *mem)
{
unsigned long size = ((unsigned long *)mem)[-1];
while (size) {
free_page(phys_to_virt(get_pte(phys_to_virt(read_cr3()), mem) & PTE_ADDR));
mem += PAGE_SIZE;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment