From: rgl@antares-labs.eu
To: 9front@9front.org
Subject: /sys/src/9: move waserror() from */fns.h to portfns.h
Date: Sun, 17 Nov 2019 16:28:29 +0100 [thread overview]
Message-ID: <CCC1CB196AF34BC0D3C1449CF0112F27@antares-labs.eu> (raw)
[-- Attachment #1: Type: text/plain, Size: 4 bytes --]
hi!
[-- Attachment #2: Type: text/plain, Size: 5405 bytes --]
diff -r 159c7e7ca171 sys/src/9/bcm/fns.h
--- a/sys/src/9/bcm/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/bcm/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -136,8 +136,6 @@
#define kmapinval()
#define countpagerefs(a, b)
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
#define KADDR(pa) ((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
#define PADDR(va) (PHYSDRAM | ((uintptr)(va) & ~KSEGM))
diff -r 159c7e7ca171 sys/src/9/bcm64/fns.h
--- a/sys/src/9/bcm64/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/bcm64/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -1,7 +1,5 @@
#include "../port/portfns.h"
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
/* l.s */
extern void sev(void);
extern int tas(void *);
diff -r 159c7e7ca171 sys/src/9/kw/fns.h
--- a/sys/src/9/kw/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/kw/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -174,8 +174,6 @@
#define getpgcolor(a) 0
#define kmapinval()
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
/*
* this low-level printing stuff is ugly,
* but there appears to be no other way to
diff -r 159c7e7ca171 sys/src/9/mtx/fns.h
--- a/sys/src/9/mtx/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/mtx/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -103,6 +103,5 @@
#define userureg(ur) (((ur)->status & MSR_PR) != 0)
void watchreset(void);
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
#define KADDR(a) ((void*)((ulong)(a)|KZERO))
#define PADDR(a) ((ulong)(a)&~KZERO)
diff -r 159c7e7ca171 sys/src/9/omap/fns.h
--- a/sys/src/9/omap/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/omap/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -165,8 +165,6 @@
#define getpgcolor(a) 0
#define kmapinval()
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
#define KADDR(pa) ((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
#define PADDR(va) (PHYSDRAM | ((uintptr)(va) & ~KSEGM))
diff -r 159c7e7ca171 sys/src/9/pc/fns.h
--- a/sys/src/9/pc/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/pc/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -208,6 +208,5 @@
void rdrandbuf(void*, ulong);
#define userureg(ur) (((ur)->cs & 3) == 3)
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
#define KADDR(a) kaddr(a)
#define PADDR(a) paddr((void*)(a))
diff -r 159c7e7ca171 sys/src/9/pc64/fns.h
--- a/sys/src/9/pc64/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/pc64/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -206,6 +206,5 @@
void rdrandbuf(void*, ulong);
#define userureg(ur) (((ur)->cs & 3) == 3)
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
#define KADDR(a) kaddr(a)
#define PADDR(a) paddr((void*)(a))
diff -r 159c7e7ca171 sys/src/9/port/portfns.h
--- a/sys/src/9/port/portfns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/port/portfns.h Sun Nov 17 16:23:04 2019 +0100
@@ -216,7 +216,8 @@
void pgrpcpy(Pgrp*, Pgrp*);
void pgrpnote(ulong, char*, int);
int pidalloc(Proc*);
-#define poperror() up->nerrlab--
+#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
+#define poperror() (up->nerrlab--)
void portcountpagerefs(ulong*, int);
int postnote(Proc*, int, char*, int);
int pprint(char*, ...);
diff -r 159c7e7ca171 sys/src/9/ppc/fns.h
--- a/sys/src/9/ppc/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/ppc/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -108,7 +108,6 @@
void trapinit(void);
void trapvec(void);
#define userureg(ur) (((ur)->status & MSR_PR) != 0)
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
#define KADDR(a) ((void*)((ulong)(a)|KZERO))
#define PADDR(a) ((((ulong)(a)&0xf0000000)==0xf0000000)?(ulong)(a):((ulong)(a)&~KZERO))
#define coherence() eieio()
diff -r 159c7e7ca171 sys/src/9/sgi/fns.h
--- a/sys/src/9/sgi/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/sgi/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -63,8 +63,6 @@
#define PTR2UINT(p) ((uintptr)(p))
#define UINT2PTR(i) ((void*)(i))
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
#define KADDR(a) ((void*)((ulong)(a)|KSEG0))
#define PADDR(a) ((ulong)(a)&~KSEGM)
diff -r 159c7e7ca171 sys/src/9/teg2/fns.h
--- a/sys/src/9/teg2/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/teg2/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -217,8 +217,6 @@
#define getpgcolor(a) 0
#define kmapinval()
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
#define KADDR(pa) ((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
#define PADDR(va) (PHYSDRAM | ((uintptr)(va) & ~KSEGM))
diff -r 159c7e7ca171 sys/src/9/xen/fns.h
--- a/sys/src/9/xen/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/xen/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -104,7 +104,6 @@
uint xchgb(uchar*, uint);
void rdrandbuf(void*, ulong);
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
#define KADDR(a) ((void*)((ulong)(a)|KZERO))
#define PADDR(a) ((ulong)(a)&~KZERO)
diff -r 159c7e7ca171 sys/src/9/zynq/fns.h
--- a/sys/src/9/zynq/fns.h Thu Nov 14 13:52:41 2019 -0800
+++ b/sys/src/9/zynq/fns.h Sun Nov 17 16:23:04 2019 +0100
@@ -16,7 +16,6 @@
KMap* kmap(Page *);
void kunmap(KMap *);
-#define waserror() (up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
#define getpgcolor(a) 0
#define kmapinval()
#define KADDR(a) kaddr(a)
reply other threads:[~2019-11-17 15:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CCC1CB196AF34BC0D3C1449CF0112F27@antares-labs.eu \
--to=rgl@antares-labs.eu \
--cc=9front@9front.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).