<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[286429] trunk/Source/bmalloc</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/286429">286429</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-12-02 07:46:01 -0800 (Thu, 02 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[libpas] Define and use PAS_RISCV
https://bugs.webkit.org/show_bug.cgi?id=233753

Patch by Zan Dobersek <zdobersek@igalia.com> on 2021-12-02
Reviewed by Yusuke Suzuki.

Define PAS_RISCV as appropriate and use it accordingly to avoid custom
x86-64 assembly, much like it's avoided for PAS_ARM. This gets libpas
compiling for RISC-V targets.

* libpas/src/libpas/pas_config.h:
* libpas/src/libpas/pas_config_prefix.h:
* libpas/src/libpas/pas_segregated_page_inlines.h:
(pas_segregated_page_deallocate_with_page):
* libpas/src/libpas/pas_utils.h:
* libpas/src/libpas/pas_utils_prefix.h:
(__pas_fence):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmalloclibpassrclibpaspas_configh">trunk/Source/bmalloc/libpas/src/libpas/pas_config.h</a></li>
<li><a href="#trunkSourcebmalloclibpassrclibpaspas_config_prefixh">trunk/Source/bmalloc/libpas/src/libpas/pas_config_prefix.h</a></li>
<li><a href="#trunkSourcebmalloclibpassrclibpaspas_segregated_page_inlinesh">trunk/Source/bmalloc/libpas/src/libpas/pas_segregated_page_inlines.h</a></li>
<li><a href="#trunkSourcebmalloclibpassrclibpaspas_utilsh">trunk/Source/bmalloc/libpas/src/libpas/pas_utils.h</a></li>
<li><a href="#trunkSourcebmalloclibpassrclibpaspas_utils_prefixh">trunk/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (286428 => 286429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog   2021-12-02 15:41:52 UTC (rev 286428)
+++ trunk/Source/bmalloc/ChangeLog      2021-12-02 15:46:01 UTC (rev 286429)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-12-02  Zan Dobersek  <zdobersek@igalia.com>
+
+        [libpas] Define and use PAS_RISCV
+        https://bugs.webkit.org/show_bug.cgi?id=233753
+
+        Reviewed by Yusuke Suzuki.
+
+        Define PAS_RISCV as appropriate and use it accordingly to avoid custom
+        x86-64 assembly, much like it's avoided for PAS_ARM. This gets libpas
+        compiling for RISC-V targets.
+
+        * libpas/src/libpas/pas_config.h:
+        * libpas/src/libpas/pas_config_prefix.h:
+        * libpas/src/libpas/pas_segregated_page_inlines.h:
+        (pas_segregated_page_deallocate_with_page):
+        * libpas/src/libpas/pas_utils.h:
+        * libpas/src/libpas/pas_utils_prefix.h:
+        (__pas_fence):
+
</ins><span class="cx"> 2021-11-24  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [libpas] Unreviewed, speculative libpas Linux fix, libpas requires libatomic in Linux etc., part 2
</span></span></pre></div>
<a id="trunkSourcebmalloclibpassrclibpaspas_configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/libpas/src/libpas/pas_config.h (286428 => 286429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/libpas/src/libpas/pas_config.h      2021-12-02 15:41:52 UTC (rev 286428)
+++ trunk/Source/bmalloc/libpas/src/libpas/pas_config.h 2021-12-02 15:46:01 UTC (rev 286429)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx"> 
</span><span class="cx"> #define PAS_ARM __PAS_ARM
</span><span class="cx"> 
</span><ins>+#define PAS_RISCV __PAS_RISCV
+
</ins><span class="cx"> #define PAS_ADDRESS_BITS                 48
</span><span class="cx"> 
</span><span class="cx"> #if PAS_ARM
</span></span></pre></div>
<a id="trunkSourcebmalloclibpassrclibpaspas_config_prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/libpas/src/libpas/pas_config_prefix.h (286428 => 286429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/libpas/src/libpas/pas_config_prefix.h       2021-12-02 15:41:52 UTC (rev 286428)
+++ trunk/Source/bmalloc/libpas/src/libpas/pas_config_prefix.h  2021-12-02 15:46:01 UTC (rev 286429)
</span><span class="lines">@@ -43,3 +43,8 @@
</span><span class="cx"> 
</span><span class="cx"> #define __PAS_ARM (__PAS_ARM64 || __PAS_ARM32)
</span><span class="cx"> 
</span><ins>+#if defined(__riscv)
+#define __PAS_RISCV 1
+#else
+#define __PAS_RISCV 0
+#endif
</ins></span></pre></div>
<a id="trunkSourcebmalloclibpassrclibpaspas_segregated_page_inlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/libpas/src/libpas/pas_segregated_page_inlines.h (286428 => 286429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/libpas/src/libpas/pas_segregated_page_inlines.h     2021-12-02 15:41:52 UTC (rev 286428)
+++ trunk/Source/bmalloc/libpas/src/libpas/pas_segregated_page_inlines.h        2021-12-02 15:46:01 UTC (rev 286429)
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx">     word = page->alloc_bits[word_index];
</span><span class="cx"> 
</span><span class="cx">     if (page_config.check_deallocation) {
</span><del>-#if !PAS_ARM
</del><ins>+#if !PAS_ARM && !PAS_RISCV
</ins><span class="cx">         new_word = word;
</span><span class="cx">         
</span><span class="cx">         asm volatile (
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx">             : "+r"(new_word)
</span><span class="cx">             : "r"((unsigned)bit_index_unmasked), "r"(begin)
</span><span class="cx">             : "memory");
</span><del>-#else /* !PAS_ARM -> so PAS_ARM */
</del><ins>+#else /* !PAS_ARM && !PAS_RISCV -> so PAS_ARM or PAS_RISCV */
</ins><span class="cx">         unsigned bit_mask;
</span><span class="cx">         bit_mask = PAS_BITVECTOR_BIT_MASK(bit_index_unmasked);
</span><span class="cx">         
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx">             pas_segregated_page_deallocation_did_fail(begin);
</span><span class="cx">         
</span><span class="cx">         new_word = word & ~bit_mask;
</span><del>-#endif /* !PAS_ARM -> so end of PAS_ARM */
</del><ins>+#endif /* !PAS_ARM && !PAS_RISCV-> so end of PAS_ARM or PAS_RISCV */
</ins><span class="cx">     } else
</span><span class="cx">         new_word = word & ~PAS_BITVECTOR_BIT_MASK(bit_index_unmasked);
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourcebmalloclibpassrclibpaspas_utilsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/libpas/src/libpas/pas_utils.h (286428 => 286429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/libpas/src/libpas/pas_utils.h       2021-12-02 15:41:52 UTC (rev 286428)
+++ trunk/Source/bmalloc/libpas/src/libpas/pas_utils.h  2021-12-02 15:46:01 UTC (rev 286429)
</span><span class="lines">@@ -83,6 +83,8 @@
</span><span class="cx"> 
</span><span class="cx"> #define PAS_ARM __PAS_ARM
</span><span class="cx"> 
</span><ins>+#define PAS_RISCV __PAS_RISCV
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> #define PAS_TYPEOF(a) decltype (a)
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourcebmalloclibpassrclibpaspas_utils_prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h (286428 => 286429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h        2021-12-02 15:41:52 UTC (rev 286428)
+++ trunk/Source/bmalloc/libpas/src/libpas/pas_utils_prefix.h   2021-12-02 15:46:01 UTC (rev 286429)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> 
</span><span class="cx"> static __PAS_ALWAYS_INLINE void __pas_fence(void)
</span><span class="cx"> {
</span><del>-#if !__PAS_ARM
</del><ins>+#if !__PAS_ARM && !__PAS_RISCV
</ins><span class="cx">     if (sizeof(void*) == 8)
</span><span class="cx">         asm volatile("lock; orl $0, (%%rsp)" ::: "memory");
</span><span class="cx">     else
</span></span></pre>
</div>
</div>

</body>
</html>