Mod: remove in-line asm

Author: yzhang71

.vscode/c_cpp_properties.json

@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "${workspaceFolder}/sysdeps/unix"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c17",
+            "cppStandard": "c++14",
+            "intelliSenseMode": "linux-clang-x64"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -0,0 +1,29 @@
+{
+    "files.associations": {
+        "cmath": "c",
+        "complex": "c",
+        "*.tbl": "c",
+        "math_config.h": "c",
+        "syscall-template.h": "c",
+        "shlib-compat.h": "c",
+        "sigsetops.h": "c",
+        "socketcall.h": "c",
+        "sysdep-cancel.h": "c",
+        "sysdep.h": "c",
+        "fcntl.h": "c",
+        "sysinfo.h": "c",
+        "kernel.h": "c",
+        "types.h": "c",
+        "stdlib.h": "c",
+        "ratio": "cpp",
+        "typeinfo": "c",
+        "cstdlib": "c",
+        "ieee754.h": "c",
+        "dl-procinfo.h": "c",
+        "unistd.h": "c",
+        "fenv.h": "c",
+        "functional": "c",
+        "kernel_sigaction.h": "c"
+    },
+    "C_Cpp.errorSquiggles": "disabled"
+}

check.log

@@ -0,0 +1 @@
+Makeconfig:43: *** objdir must be defined by the build-directory Makefile.  Stop.

elf/rtld.c

@@ -401,6 +401,7 @@ TLS_INIT_HELPER
 #endif
 
 /* Helper function for syscall implementation.  */
+// remove in-line asm
 #ifdef DL_SYSINFO_IMPLEMENTATION
 DL_SYSINFO_IMPLEMENTATION
 #endif

elf/sotruss-lib.c

@@ -76,7 +76,11 @@ init (void)
   /* Determine whether this process is supposed to be traced and if
      yes, whether we should print into a file.  */
   const char *which_process = getenv ("SOTRUSS_WHICH");
-  pid_t pid = getpid ();
+
+  // Dennis Edit
+  pid_t pid = 0;
+  // pid_t pid = getpid ();
+
   int out_fd = -1;
   if (match_pid (pid, which_process))
     {
@@ -253,7 +257,10 @@ print_enter (uintptr_t *refcook, uintptr_t *defcook, const char *symname,
   char buf[3 * sizeof (pid_t) + 3];
   buf[0] = '\0';
   if (print_pid)
-    snprintf (buf, sizeof (buf), "%5ld: ", (long int) getpid ());
+
+    // Dennis Edit
+    snprintf (buf, sizeof (buf), "%5ld: ", (long int) 0);
+    // snprintf (buf, sizeof (buf), "%5ld: ", (long int) getpid ());
 
   fprintf (out_file, "%s%15s -> %-15s:%s%s(0x%lx, 0x%lx, 0x%lx)\n",
 	   buf, (char *) *refcook, (char *) *defcook,
@@ -340,7 +347,10 @@ print_exit (uintptr_t *refcook, uintptr_t *defcook, const char *symname,
   char buf[3 * sizeof (pid_t) + 3];
   buf[0] = '\0';
   if (print_pid)
-    snprintf (buf, sizeof (buf), "%5ld: ", (long int) getpid ());
+
+    // Dennis Edit
+    snprintf (buf, sizeof (buf), "%5ld: ", (long int) 0);
+    // snprintf (buf, sizeof (buf), "%5ld: ", (long int) getpid ());
 
   fprintf (out_file, "%s%15s -> %-15s:%s%s - 0x%lx\n",
 	   buf, (char *) *refcook, (char *) *defcook, " ", symname, reg);

myconfig.sh

@@ -13,10 +13,10 @@ set -e
 BUILDDIR=build
 mkdir -p $BUILDDIR
 cd $BUILDDIR
-../configure --prefix=/sysroot-coulson --host=i686-linux-gnu --build=i686-linux-gnu\
+../configure --disable-werror --disable-profile --prefix=/home/dennis/Documents/Just-One-Turtle/glibc/target --host=i686-linux-gnu --build=i686-linux-gnu \
     CFLAGS=" -O2 -march=i686 -g" \
     CC="gcc -m32" CXX="g++ -m32" \
     CFLAGS="-O2 -march=i686" \
     CXXFLAGS="-O2 -march=i686"
 #    --with-headers=`pwd`/../kernel-headers --enable-kernel=2.2.0
-#    --disable-shared
+#    --disable-shared

support/shell-container.c

@@ -162,7 +162,11 @@ kill_func (char **argv)
     {
       pid_t pid;
       if (strcmp (argv[i], "$$") == 0)
-	pid = getpid ();
+      
+  // Dennis Edit
+	pid = 0;
+  // pid = getpid ();
+
       else
 	pid = atoi (argv[i]);
       kill (pid, signum);

sysdeps/generic/math-barriers.h

@@ -29,9 +29,16 @@
    expression evaluations with respect to accesses to the
    floating-point environment.  */
 
-#define math_opt_barrier(x)					\
-  ({ __typeof (x) __x = (x); __asm ("" : "+m" (__x)); __x; })
-#define math_force_eval(x)						\
-  ({ __typeof (x) __x = (x); __asm __volatile__ ("" : : "m" (__x)); })
+#define math_opt_barrier(x)                \
+  ({ __typeof (x) __x = (x);               \
+     volatile __typeof (__x) *__px = &__x; \
+     *__px = __x;                          \
+     __x; })
+
+#define math_force_eval(x)                        \
+  do {                                            \
+    volatile __typeof (x) __x = (x);              \
+    (void)__x;                                    \
+  } while (0)
 
 #endif /* math-barriers.h */

sysdeps/i386/fpu/fclrexcpt.c

@@ -24,36 +24,9 @@
 int
 __feclearexcept (int excepts)
 {
-  fenv_t temp;
-
-  /* Mask out unsupported bits/exceptions.  */
-  excepts &= FE_ALL_EXCEPT;
-
-  /* Bah, we have to clear selected exceptions.  Since there is no
-     `fldsw' instruction we have to do it the hard way.  */
-  __asm__ ("fnstenv %0" : "=m" (*&temp));
-
-  /* Clear the relevant bits.  */
-  temp.__status_word &= excepts ^ FE_ALL_EXCEPT;
-
-  /* Put the new data in effect.  */
-  __asm__ ("fldenv %0" : : "m" (*&temp));
-
-  /* If the CPU supports SSE, we clear the MXCSR as well.  */
-  if (CPU_FEATURE_USABLE (SSE))
-    {
-      unsigned int xnew_exc;
-
-      /* Get the current MXCSR.  */
-      __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc));
-
-      /* Clear the relevant bits.  */
-      xnew_exc &= ~excepts;
-
-      /* Put the new data in effect.  */
-      __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc));
-    }
-
+  #include <stdlib.h>
+  // removed in-line asm
+  exit(EXIT_FAILURE);
   /* Success.  */
   return 0;
 }

sysdeps/i386/fpu/fedisblxcpt.c

@@ -24,30 +24,8 @@
 int
 fedisableexcept (int excepts)
 {
-  unsigned short int new_exc, old_exc;
-
-  /* Get the current control word.  */
-  __asm__ ("fstcw %0" : "=m" (*&new_exc));
-
-  old_exc = (~new_exc) & FE_ALL_EXCEPT;
-
-  excepts &= FE_ALL_EXCEPT;
-
-  new_exc |= excepts;
-  __asm__ ("fldcw %0" : : "m" (*&new_exc));
-
-  /* If the CPU supports SSE we set the MXCSR as well.  */
-  if (CPU_FEATURE_USABLE (SSE))
-    {
-      unsigned int xnew_exc;
-
-      /* Get the current control word.  */
-      __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc));
-
-      xnew_exc |= excepts << 7;
-
-      __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc));
-    }
-
-  return old_exc;
+  #include <stdlib.h>
+  // removed in-line asm
+  exit(EXIT_FAILURE);
+  return 0;
 }