Explorar o código

argc is a longint.

git-svn-id: branches/laksen/riscv_new@39696 -
Jeppe Johansen %!s(int64=7) %!d(string=hai) anos
pai
achega
ba8245dccb
Modificáronse 3 ficheiros con 11 adicións e 11 borrados
  1. 2 2
      rtl/linux/riscv64/cprt0.as
  2. 7 7
      rtl/linux/riscv64/dllprt0.as
  3. 2 2
      rtl/linux/riscv64/prt0.as

+ 2 - 2
rtl/linux/riscv64/cprt0.as

@@ -65,7 +65,7 @@ _start:
         add  a4, a2, a4
 
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_argc)
-	sd	a1,%pcrel_lo(1b)(x8)
+	sw	a1,%pcrel_lo(1b)(x8)
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_argv)
 	sd	a2,%pcrel_lo(1b)(x8)
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_envp)
@@ -118,7 +118,7 @@ __data_start:
         .comm __stkptr,8
 
         .comm operatingsystem_parameter_envp,8
-        .comm operatingsystem_parameter_argc,8
+        .comm operatingsystem_parameter_argc,4
         .comm operatingsystem_parameter_argv,8
 
         .section ".comment"

+ 7 - 7
rtl/linux/riscv64/dllprt0.as

@@ -28,7 +28,7 @@ FPC_SHARED_LIB_START:
 
         /* a0 contains argc, a1 contains argv and a2 contains envp */
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_argc)
-	sd	a0,%pcrel_lo(1b)(x8)
+	sw	a0,%pcrel_lo(1b)(x8)
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_argv)
 	sd	a1,%pcrel_lo(1b)(x8)
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_envp)
@@ -60,15 +60,15 @@ _haltproc:
 .data
 
         .type operatingsystem_parameters,object
-        .size operatingsystem_parameters,24
+        .size operatingsystem_parameters, 24
 operatingsystem_parameters:
-        .skip 3*8
-        .global operatingsystem_parameter_envp
+        .skip 3 * 8
         .global operatingsystem_parameter_argc
         .global operatingsystem_parameter_argv
-        .set operatingsystem_parameter_envp,operatingsystem_parameters+0
-        .set operatingsystem_parameter_argc,operatingsystem_parameters+8
-        .set operatingsystem_parameter_argv,operatingsystem_parameters+16
+        .global operatingsystem_parameter_envp
+        .set operatingsystem_parameter_argc, operatingsystem_parameters+0
+        .set operatingsystem_parameter_argv, operatingsystem_parameters+8
+        .set operatingsystem_parameter_envp, operatingsystem_parameters+16
 
 .bss
 

+ 2 - 2
rtl/linux/riscv64/prt0.as

@@ -34,7 +34,7 @@ _start:
 
 	/* Save argc, argv, envp, and initial stack pointer */
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_argc)
-	sd	x5,%pcrel_lo(1b)(x8)
+	sw	x5,%pcrel_lo(1b)(x8)
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_argv)
 	sd	x6,%pcrel_lo(1b)(x8)
 1:auipc	x8,%pcrel_hi(operatingsystem_parameter_envp)
@@ -79,7 +79,7 @@ __data_start:
 	.comm __stkptr,8
 
 	.comm operatingsystem_parameter_envp,8
-	.comm operatingsystem_parameter_argc,8
+	.comm operatingsystem_parameter_argc,4
 	.comm operatingsystem_parameter_argv,8
 
 	.section .note.GNU-stack,"",%progbits