From patchwork Tue Mar 12 17:09:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 160139 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp13201050oce; Tue, 12 Mar 2019 10:21:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzJQiD3bT21eUwU4kZ6jVVC3rQn5CTSb+CtU+jgq9t1P61HINJZzQJx5BBlYxOF03Z5eCMG X-Received: by 2002:a25:814c:: with SMTP id j12mr32774729ybm.363.1552411298309; Tue, 12 Mar 2019 10:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552411298; cv=none; d=google.com; s=arc-20160816; b=Tqx29HcPlFFo1yYaTbDU0tiis+D5Wb85a94c+1100NSfCy4Xc4Cimvzugmp/1tbvNw FcCDQ3tzplhEVHG7Ea7ElTvdgiD6BANAe68kHJ3TvsnUQCBREfF/AlFxCI9A7GWlREOw Jy1x1tiU7x2h1nTDZLy0JWz9FY98or0TJgy/3WqqVu+aDb52xCMmgtQMxAN+7ZfzpHVP rzLVCVAMa8zmJtEP9eTWJz39ib6YZpm3bnqy0yLqnscCqdoaV055hrnYT8LTTX5airnx dseSbAqRkDyf544eEZT3ADw/El656CQRykn1BDTXdGh+bI/cAFidnG9q47o3uz2ZKcYw gRTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=b06gUAY8BUpMnv5hAfRqzGBUy0vopy7NfINy5b7+/Ro=; b=InzFDjwEYX99SiwLPtLr6L6XnndmNXUuRS7iSuYocxdpPKfAk3nZ12UQysN/KoWOUE IJMgCFhj7aslQyQbPvORn1wnKkGl0I9IPEgigoaPs7MQLFOCUGMMiPP36vyQfuKZIIMc +c49646KgYKkBazCgVf/mtF+H1TItt0iyzy0KdY+CvyaCiDSeZEyyFavHF4dOPNmAhFn Sg7x28xabv9Z5bwqWs+hah4EN3GjAx6LMfPzB5xsPCIY4ynxmTkcbBeDe+L8rMPWfLuf fqneK5CRrsj4MNry9D2c5B7ZncXLkcqJTiIUsgj7ZWhte/SjQAFz7OY7jVu4HvyEOy1d WP1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=miqon2An; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q80si5557069ybg.209.2019.03.12.10.21.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2019 10:21:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=miqon2An; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:56310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l5t-0000GZ-OL for patch@linaro.org; Tue, 12 Mar 2019 13:21:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l2i-0005SB-VQ for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kzm-0003tm-PP for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:20 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kzm-0003sQ-Bm for qemu-devel@nongnu.org; Tue, 12 Mar 2019 13:15:18 -0400 Received: by mail-wm1-x336.google.com with SMTP id x10so3446879wmg.2 for ; Tue, 12 Mar 2019 10:15:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b06gUAY8BUpMnv5hAfRqzGBUy0vopy7NfINy5b7+/Ro=; b=miqon2AnUKeHPq30JahMaoBlZz6AJyjgudVOOlDnkKt9VZOKHkf2v2ixZMKkkugKiQ JKj2WiLqyN5zKG+NDE0CmtgVdkEc0VPfPWH0PKlvku1jSpY2qVD+zVIbgFIk+y3WOEAm n5rpk/tY6gbAD5vF/Mq1BgYy055X4XPMCx8sHInIGVQbiYUBYkSWsbbM+3mnHmbANMG5 hEYZfwdk+1h/X6mQomiESbJDOBx+hnwuDcgduFA9i2oL4DoGPbMuJPmkWkq6h1QsGBOF Wl9mGEPpcD1apIuPSejIqAShiH1z6rbuUWM7kuXEZo3/NdhxPqq8f6UxfHVdRfyCFmXx cgUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b06gUAY8BUpMnv5hAfRqzGBUy0vopy7NfINy5b7+/Ro=; b=IFy13iBNawACaes2wKjPSziBdr0hc3rOn0JGNIgFiA7vjja3zicLH9Cu3aPjISpSxd shoqwmVX8vpvtRHffg8dj/ZHvwQUgh4eZqP3iKv1eaGUJ2i+kvuyKDw5mlYnx0pDY3Ug xtZNlqcSwg4ov3+uEUnh0+9WycXdR1XYNaQMSK+ixVMzKYMP6a4VCmCd6ikS0PJrO5+P P6YQ8Gbhtt7F4xUKUJqaNronbWz9CUpRjTPPbd/k0b9KGgnyDNPVm2cSi4oBgqIWlNb0 7osPj0mV3R+W1dQXC5g0NLPtL9bn4xU43ZBACUH6iM9jXtMiDtWD5ZMRrOsms0N2dU8k Ttcg== X-Gm-Message-State: APjAAAU1LJ7JFBEw0ahXlBFrUE2rikq7FQ2v+uOtVA/K9Z/67PPanCX/ GOXJpPh6bhcuhscU4fZFnVFDRg== X-Received: by 2002:a1c:6483:: with SMTP id y125mr148521wmb.12.1552410916629; Tue, 12 Mar 2019 10:15:16 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y20sm6097167wmi.34.2019.03.12.10.15.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 10:15:13 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 762241FF87; Tue, 12 Mar 2019 17:09:32 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 17:09:27 +0000 Message-Id: <20190312170931.25013-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312170931.25013-1-alex.bennee@linaro.org> References: <20190312170931.25013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PULL 22/26] tests/tcg/i386: add system mode Hello World test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This introduces the build framework for simple i386 system tests. The first test is the eponymous "Hello World" which simply outputs the text on the serial port and then exits. I've included the framework for x86_64 but it is not in this series as it is a work in progress. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target new file mode 100644 index 0000000000..53c9c5ece0 --- /dev/null +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -0,0 +1,46 @@ +# +# x86 system tests +# +# This currently builds only for i386. The common C code is built +# with standard compiler flags however so we can support both by +# adding additional boot files for x86_64. +# + +I386_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/i386/system +X64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/x86_64/system +# Set search path for all sources +VPATH+=$(I386_SYSTEM_SRC) + +# These objects provide the basic boot code and helper functions for all tests +CRT_OBJS=boot.o + +X86_TEST_SRCS=$(wildcard $(I386_SYSTEM_SRC)/*.c) +X86_TESTS = $(patsubst $(I386_SYSTEM_SRC)/%.c, %, $(X86_TEST_SRCS)) + +ifeq ($(TARGET_X86_64), y) +CRT_PATH=$(X64_SYSTEM_SRC) +LINK_SCRIPT=$(X64_SYSTEM_SRC)/kernel.ld +LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_x86_64 +else +CRT_PATH=$(I386_SYSTEM_SRC) +CFLAGS+=-m32 +LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld +LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386 +# FIXME: move to common once x86_64 is bootstrapped +TESTS+=$(X86_TESTS) +endif +CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) +LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc + +# building head blobs +.PRECIOUS: $(CRT_OBJS) + +%.o: $(CRT_PATH)/%.S + $(CC) $(CFLAGS) -c $< -o $@ + +# Build and link the tests +%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) + $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + +# Running +QEMU_OPTS+=-device isa-debugcon,chardev=output -device isa-debug-exit,iobase=0xf4,iosize=0x4 -kernel diff --git a/tests/tcg/i386/system/boot.S b/tests/tcg/i386/system/boot.S new file mode 100644 index 0000000000..90aa174908 --- /dev/null +++ b/tests/tcg/i386/system/boot.S @@ -0,0 +1,172 @@ +/* + * i386 boot code, based on qemu-bmibug. + * + * Copyright 2019 Doug Gale + * Copyright 2019 Linaro + * + * This work is licensed under the terms of the GNU GPL, version 3 or later. + * See the COPYING file in the top-level directory. + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + + .section .head + + /* Multi-boot header */ +multiboot_st: + .int 0x1BADB002 + .int 0x10000 + .int -(0x10000+0x1BADB002) + // Load address + .int __load_st + .int __load_st + .int __load_en + .int __bss_en + .int _start + // mode + .int 0 + // width + .int 0 + // height + .int 0 + // depth + .int 0 + + .code32 + .section .text + + /* Kernel Entry Point */ +.global _start +_start: + // Setup stack ASAP + mov $stack_end,%esp + + // Load GDT ASAP + lgdt gdtr + ljmp $0x8,$.Lloadcs +.Lloadcs: + mov $0x10,%eax + mov %eax,%ds + mov %eax,%es + mov %eax,%fs + mov %eax,%gs + mov %eax,%ss + + // Fixup the IDT to the ridiculous i386 layout + xor %ebx,%ebx +.Lnextidt: + mov idt_00(,%ebx,8),%eax + shr $16,%eax + movw $0x8,idt_00+2(,%ebx,8) + movw $0x8E00,idt_00+4(,%ebx,8) + movw %ax,idt_00+6(,%ebx,8) + add $1,%ebx + cmp $32,%ebx + jl .Lnextidt + + // Load IDTR + push $idt_00 + push $((32 * 8 - 1) << 16) + lidt 2(%esp) + add $8,%esp + + /* + * Don't worry about stack frame, assume everthing + * is garbage when we return, we won't need it. + */ + call main + + /* output any non-zero result in eax to isa-debug-exit device */ + test %al, %al + jz 1f + out %ax, $0xf4 + +1: /* QEMU ACPI poweroff */ + mov $0x604,%edx + mov $0x2000,%eax + out %ax,%dx + hlt + jmp 1b + + /* + * Helper Functions + */ + + /* Output a single character to serial port */ + .global __sys_outc +__sys_outc: + pushl %ebp + movl %esp, %ebp + out %al,$0xE9 + movl %ebp, %esp + popl %ebp + ret + + + /* Interrupt Descriptor Table */ + + .section .data + .align 16 + +idt_00: .int 0, 0 +idt_01: .int 0, 0 +idt_02: .int 0, 0 +idt_03: .int 0, 0 +idt_04: .int 0, 0 +idt_05: .int 0, 0 +idt_06: .int 0, 0 /* intr_6_opcode, Invalid Opcode */ +idt_07: .int 0, 0 +idt_08: .int 0, 0 +idt_09: .int 0, 0 +idt_0A: .int 0, 0 +idt_0B: .int 0, 0 +idt_0C: .int 0, 0 +idt_0D: .int 0, 0 +idt_0E: .int 0, 0 +idt_0F: .int 0, 0 +idt_10: .int 0, 0 +idt_11: .int 0, 0 +idt_12: .int 0, 0 +idt_13: .int 0, 0 +idt_14: .int 0, 0 +idt_15: .int 0, 0 +idt_16: .int 0, 0 +idt_17: .int 0, 0 +idt_18: .int 0, 0 +idt_19: .int 0, 0 +idt_1A: .int 0, 0 +idt_1B: .int 0, 0 +idt_1C: .int 0, 0 +idt_1D: .int 0, 0 +idt_1E: .int 0, 0 +idt_1F: .int 0, 0 + +gdt: + .short 0 +gdtr: + .short gdt_en - gdt - 1 + .int gdt + + // Code + .short 0xFFFF + .short 0 + .byte 0 + .byte 0x9b + .byte 0xCF + .byte 0 + + // Data + .short 0xFFFF + .short 0 + .byte 0 + .byte 0x93 + .byte 0xCF + .byte 0 + +gdt_en: + + .section .bss + .align 16 + +stack: .space 65536 +stack_end: diff --git a/tests/tcg/i386/system/hello.c b/tests/tcg/i386/system/hello.c new file mode 100644 index 0000000000..821dc0ef09 --- /dev/null +++ b/tests/tcg/i386/system/hello.c @@ -0,0 +1,14 @@ +/* + * Hello World, system test version + * + * We don't have the benefit of libc, just builtin C primitives and + * whatever is in minilib. + */ + +#include + +int main(void) +{ + ml_printf("Hello World\n"); + return 0; +} diff --git a/tests/tcg/i386/system/kernel.ld b/tests/tcg/i386/system/kernel.ld new file mode 100644 index 0000000000..92de525e93 --- /dev/null +++ b/tests/tcg/i386/system/kernel.ld @@ -0,0 +1,23 @@ +SECTIONS { + . = 0x100000; + + .text : { + __load_st = .; + *(.head) + *(.text) + } + + .rodata : { + *(.rodata) + } + + .data : { + *(.data) + __load_en = .; + } + + .bss : { + *(.bss) + __bss_en = .; + } +}