commit d0e3c4e939e8a377540d9f6720b7ec248431de8c
author Zhong,Fangjian <fangjian.zhong@intel.com> Fri Jan 26 10:57:49 2018 +0800
committer Michael Ryleev <gmar@google.com> Tue Apr 03 15:58:12 2018 -0700
tree 7ff4438bdf16ab0f5a44f1a787a572a92a5c2429
parent 864d5da56ca64c268b6c07e3e09bc7c7ceedc10f

[lib][syscall] update stubgen.py to support x86 64bit

add option "-a" to speicfy architure, available architure:
arm, x86_64, default architure is arm.

Change-Id: I972caba7da0ac4c887328b90c6622d4438c3c0cf

AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 559b7e6..1a1bba2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,3 +9,4 @@
 Google Inc.
 NVIDIA CORPORATION.
 Travis Geiselbrecht <geist@foobox.com>
+Intel Corporation.

lib/syscall/stubgen/stubgen.py

diff --git a/lib/syscall/stubgen/stubgen.py b/lib/syscall/stubgen/stubgen.py
index aac56d5..6474769 100755
--- a/lib/syscall/stubgen/stubgen.py
+++ b/lib/syscall/stubgen/stubgen.py
@@ -56,7 +56,7 @@
 """
 
 copyright_header = """/*
- * Copyright (c) 2013-2017 Google Inc. All rights reserved
+ * Copyright (c) 2012-2018 LK Trusty Authors. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files
@@ -90,13 +90,38 @@
 # see include/asm.h in lk
 asm_header = "asm.h"
 
-syscall_stub = """
+class Architecture:
+    def __init__(self, syscall_stub):
+        self.syscall_stub = syscall_stub
+
+arch_dict = {
+    "arm" : Architecture (
+        syscall_stub = """
 .section .text.%(sys_fn)s
 FUNCTION(%(sys_fn)s)
     ldr     r12, =__NR_%(sys_fn)s
     swi     #0
     bx      lr
-"""
+"""),
+    "x86_64" : Architecture (
+        syscall_stub = """
+FUNCTION(%(sys_fn)s)
+    pushfq
+    pushq %%rbp
+    pushq %%rbx
+    pushq %%r15
+    movq $__NR_%(sys_fn)s, %%rax
+    leaq .L%(sys_fn)s_sysreturn(%%rip), %%rbx
+    movq %%rsp, %%rbp
+    sysenter
+.L%(sys_fn)s_sysreturn:
+    popq %%r15
+    popq %%rbx
+    popq %%rbp
+    popfq
+    ret
+"""),
+}
 
 syscall_define = "#define __NR_%(sys_fn)s\t\t%(sys_nr)s\n"
 
@@ -174,7 +199,7 @@
         return None
 
 
-def process_table(table_file, std_file, stubs_file, verify):
+def process_table(table_file, std_file, stubs_file, verify, arch):
     """
     Process a syscall table and generate:
     1. A sycall stubs file
@@ -202,7 +227,7 @@
         if not verify:
             define_lines += syscall_define % params
             proto_lines += syscall_proto % params
-            stub_lines += syscall_stub % params
+            stub_lines += arch.syscall_stub % params
 
 
     tbl.close()
@@ -239,6 +264,9 @@
     op.add_option("-s", "--stubs-file", type="string",
             dest="stub_file", default=None,
             help="path to syscall assembly stubs file.")
+    op.add_option("-a", "--arch", type="string",
+            dest="arch", default="arm",
+            help="arch of stub assembly files: " + str(arch_dict.keys()))
 
     (opts, args) = op.parse_args()
 
@@ -251,7 +279,8 @@
             op.print_help()
             sys.exit(1)
 
-    process_table(args[0], opts.std_file, opts.stub_file, opts.verify)
+    process_table(args[0], opts.std_file, opts.stub_file, opts.verify,
+            arch_dict[opts.arch])
 
 
 if __name__ == '__main__':