Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by a9b8c5461646 with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Sat, 06 Mar 2021 09:57:38 +0000 (GMT)
Received: from localhost ([172.29.0.7])
	by sv1.famkaufmann.info with LMTP
	id sH6kNg9SQ2AxDAAALHnFKQ
	(envelope-from <mayernico256@gmail.com>)
	for <mlmmj-tyndur-devel>; Sat, 06 Mar 2021 09:57:35 +0000
Delivered-To: tyndur-devel@tyndur.org
Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [2a00:1450:4864:20::62b])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPS id 7f8bf9ea (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <tyndur-devel@tyndur.org>;
	Sat, 6 Mar 2021 09:57:35 +0000 (UTC)
Received: by mail-ej1-x62b.google.com with SMTP id w1so8700826ejf.11
        for <tyndur-devel@tyndur.org>; Sat, 06 Mar 2021 01:57:35 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:to:subject:date:message-id:mime-version
         :content-transfer-encoding;
        bh=wTkcW2c1toq0GEDc7ez2Ue+iqJtb52FuNlpt3N5YFdI=;
        b=EL+R418LPi7EJULN6qVzZREIyDP9PehJZcnHmbJLDB81/OYMApHlg6588rWHg/QE+N
         mls8yQSQhVHy54Pwn4c0JM+KBfpkgxGd21fGJZzieD2kHoInhSc3LsnJhFp8OQEn02Rk
         2J6Dynf5c8knQ4t9aQadeKzJJI2CxyOiTnDbu4w6uvw745XHjc4PjhOKNItQ/vh8sdA0
         yA45hxxAMGI0mhKLpsNnFQ6RblR+AD+DN6Qf2+cXzP2N4L+QZQnMOrCsVdtRvETpUnMt
         nor9+YVKSKBFccKVOqUhMoIdE2b0DnVdh2j8KEBYLNR3566iOq2NQsze79ah3zgBi5C6
         47SQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:to:subject:date:message-id:mime-version
         :content-transfer-encoding;
        bh=wTkcW2c1toq0GEDc7ez2Ue+iqJtb52FuNlpt3N5YFdI=;
        b=KP+Tio8wSR3ypQ0+OIoLCH//qmTZg4K5xqt4XOf7GE03C1V8khwbxq0wGZOD4pwmj7
         dcBo4NqkZ6PVyDURUH4wTUHw66Vvu+cisisZ3G7zCKcLdzfRbG6thYdacdjkLnSil1FT
         kQzQVQFaX0z2OXoAjIX1PVmuILUGxt3vnPut+U1RShYS5BxemDUxQu2B7GIbeGuWyxzJ
         w89SdSBTC2fKf7MQT8RCT82Llag6vqwxCRBItTJ0hfvV0vW3HRBMNs4Sd+WXvo+vlpXB
         eePwgrX8r8ldS+2DyCO7/V3klu4B9XRnmSUOclO/Up15+AUmJCqVuAwpGwh5655wlPnt
         r1bw==
X-Gm-Message-State: AOAM533iSdsmPv549ZCnnb+kmgYstnLIZcoqyl9cQP2IG1+dnDk4GXNZ
	tfXVkKQqgj7trk/MJdSV8fSTW2tMTJY=
X-Google-Smtp-Source: ABdhPJwJ38omFQEhLRibc1FBe/Ppv/FFUlh7LDBUsqdNLnipEgg3glcAIprNraiLs925c46YxMz0Lg==
X-Received: by 2002:a17:906:f44:: with SMTP id h4mr6172366ejj.204.1615024655009;
        Sat, 06 Mar 2021 01:57:35 -0800 (PST)
Received: from localhost.localdomain (p57a5fdf1.dip0.t-ipconnect.de. [87.165.253.241])
        by smtp.gmail.com with ESMTPSA id b12sm3170286eds.94.2021.03.06.01.57.34
        for <tyndur-devel@tyndur.org>
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Sat, 06 Mar 2021 01:57:34 -0800 (PST)
From: Nico Mayer <mayernico256@gmail.com>
X-Google-Original-From: Nico Mayer <mayerNico256@gmail.com>
To: tyndur-devel@tyndur.org
Subject: [PATCH v2] syscalls: memory_info wird falsch aufgerufen
Date: Sat,  6 Mar 2021 10:57:28 +0100
Message-Id: <20210306095728.55303-1-mayerNico256@gmail.com>
X-Mailer: git-send-email 2.29.2
Errors-To: toni@tyndur.org
Precedence: list
Reply-To: tyndur-Patches <tyndur-devel@tyndur.org>
List-Id: tyndur-Patches <tyndur-devel.tyndur.org>
List-Unsubscribe: <mailto:tyndur-devel+unsubscribe@tyndur.org>
List-Post: <mailto:tyndur-devel@tyndur.org>
List-Help: <mailto:tyndur-devel+help@tyndur.org>
List-Subscribe: <mailto:tyndur-devel+subscribe@tyndur.org>
List-Owner: <mailto:toni@tyndur.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

! Die Aufruf-Funktion des Syscalls "memory_info" erwartet, dass das
  Ergebnis ueber das EAX und EDX Register übergeben wird. Der Kernel
  erwartet aber zwei Referenzen als Parameter, in denen das Ergebnis
  geschrieben wird. Dieser Commit aendert die Aufruf-Funktion fuer den
  Syscall "memory_info" und behebt hierdurch das Problem.

Signed-off-by: Nico Mayer <mayerNico256@gmail.com>
---
 src/kernel/src/syscall.c               | 2 +-
 src/modules/lib/syscalls/memory_info.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/kernel/src/syscall.c b/src/kernel/src/syscall.c
index 21d1115b..d4812844 100644
--- a/src/kernel/src/syscall.c
+++ b/src/kernel/src/syscall.c
@@ -53,7 +53,7 @@ void syscall_init()
             &syscall_mem_allocate_physical, 3);
     syscall_register(SYSCALL_MEM_FREE, &syscall_mem_free, 2);
     syscall_register(SYSCALL_MEM_FREE_PHYSICAL, &syscall_mem_free_physical, 2);
-    syscall_register(SYSCALL_MEM_INFO, &syscall_mem_info, 0);
+    syscall_register(SYSCALL_MEM_INFO, &syscall_mem_info, 2);
 
     syscall_register(SYSCALL_PM_GET_PID, (void*) &syscall_pm_get_pid, 0);
     syscall_register(SYSCALL_PM_GET_PARENT_PID, (void*)
diff --git a/src/modules/lib/syscalls/memory_info.c b/src/modules/lib/syscalls/memory_info.c
index 107623bb..4ec5169f 100644
--- a/src/modules/lib/syscalls/memory_info.c
+++ b/src/modules/lib/syscalls/memory_info.c
@@ -32,8 +32,9 @@
 memory_info_t memory_info()
 {
     memory_info_t result;
+    int ret;
 
-    SYSCALL0_TWO_RESULTS(SYSCALL_MEM_INFO, result.total, result.free);
+    SYSCALL2(SYSCALL_MEM_INFO, &result.total, &result.free, ret);
 
     return result;
 }
-- 
2.29.2

