From b4a20a5f04f66a2430b43cabe528f4cc476276c8 Mon Sep 17 00:00:00 2001
From: wanda-phi <145241585+wanda-phi@users.noreply.github.com>
Date: Sat, 4 May 2024 14:57:51 +0000
Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20=20@=20bcd20?=
=?UTF-8?q?ceb7b7cc361876ea634d261223161339461=20=F0=9F=9A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.buildinfo | 2 +-
_sources/xpla3/structure.rst.txt | 23 +++--
_static/basic.css | 2 +-
_static/doctools.js | 2 +-
_static/language_data.js | 4 +-
_static/searchtools.js | 165 ++++++++++++++++++++-----------
genindex.html | 2 +-
index.html | 2 +-
search.html | 2 +-
searchindex.js | 2 +-
xc2c/bitstream.html | 2 +-
xc2c/db-device-xc2c128.html | 2 +-
xc2c/db-device-xc2c256.html | 2 +-
xc2c/db-device-xc2c32.html | 2 +-
xc2c/db-device-xc2c32a.html | 2 +-
xc2c/db-device-xc2c384.html | 2 +-
xc2c/db-device-xc2c512.html | 2 +-
xc2c/db-device-xc2c64.html | 2 +-
xc2c/db-device-xc2c64a.html | 2 +-
xc2c/db-devices.html | 2 +-
xc2c/index.html | 2 +-
xc2c/intro.html | 2 +-
xc2c/jtag.html | 2 +-
xc2c/structure.html | 2 +-
xc9500/bitstream-xc9500.html | 2 +-
xc9500/bitstream-xc9500xl.html | 2 +-
xc9500/database.html | 2 +-
xc9500/db-device-xc95108.html | 2 +-
xc9500/db-device-xc95144.html | 2 +-
xc9500/db-device-xc95144xl.html | 2 +-
xc9500/db-device-xc95144xv.html | 2 +-
xc9500/db-device-xc95216.html | 2 +-
xc9500/db-device-xc95288.html | 2 +-
xc9500/db-device-xc95288xl.html | 2 +-
xc9500/db-device-xc95288xv.html | 2 +-
xc9500/db-device-xc9536.html | 2 +-
xc9500/db-device-xc9536xl.html | 2 +-
xc9500/db-device-xc9536xv.html | 2 +-
xc9500/db-device-xc9572.html | 2 +-
xc9500/db-device-xc9572xl.html | 2 +-
xc9500/db-device-xc9572xv.html | 2 +-
xc9500/db-devices.html | 2 +-
xc9500/index.html | 2 +-
xc9500/intro.html | 2 +-
xc9500/jtag.html | 2 +-
xc9500/structure.html | 2 +-
xpla3/bitstream.html | 34 +++----
xpla3/database.html | 2 +-
xpla3/db-device-xcr3032xl.html | 2 +-
xpla3/db-device-xcr3064xl.html | 2 +-
xpla3/db-device-xcr3128xl.html | 2 +-
xpla3/db-device-xcr3256xl.html | 2 +-
xpla3/db-device-xcr3384xl.html | 2 +-
xpla3/db-device-xcr3512xl.html | 2 +-
xpla3/db-devices.html | 2 +-
xpla3/index.html | 2 +-
xpla3/intro.html | 2 +-
xpla3/jtag.html | 2 +-
xpla3/structure.html | 29 ++++--
59 files changed, 215 insertions(+), 148 deletions(-)
diff --git a/.buildinfo b/.buildinfo
index 3414c6fe..5698f479 100644
--- a/.buildinfo
+++ b/.buildinfo
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: cb0c09bdc91a7460268e1563ad43a620
+config: 08cc258c7ccb6ea49dac4f64597a074b
tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/_sources/xpla3/structure.rst.txt b/_sources/xpla3/structure.rst.txt
index 68c7e02d..08f802ba 100644
--- a/_sources/xpla3/structure.rst.txt
+++ b/_sources/xpla3/structure.rst.txt
@@ -291,6 +291,8 @@ Each macrocell has a register. It has:
- LUT output
- pad input buffer (so-called fast input register)
+ - the Q output of the previous register in the FB (wrapping from 0 to 15) (so-called fast shift register)
+ - the Q output of the next register in the FB (wrapping from 15 to 0) (so-called fast shift register)
- clock or gate input routable from one of:
@@ -357,6 +359,12 @@ The fuses involved are:
- ``LATCH``
- ``DFFCE``
+- ``FB[i].MC[j].REG_D_IREG``: if programmed, and the ``REG_D_SHIFT`` fuse is not programmed, the register D input is connected to ``FB[i].MC[j].IOB.I``; if neither is programmed, the register D input is connected to ``FB[i].MC[j].LUT_OUT``
+- ``FB[i].MC[j].REG_D_SHIFT``: if programmed, the register D input is connected to the previous or next MC's register Q output; otherwise, the connection is determined by ``REG_D_IREG`` fuse
+- ``FB[i].MC[j].REG_D_SHIFT_DIR``: when the previous fuse is programmed, determines which MC's register Q output is connected to this register's D input
+
+ - ``UP``: D input connected to ``FB[i].MC[(j - 1) % 16].REG``
+ - ``DOWN``: D input connected to ``FB[i].MC[(j + 1) % 16].REG``
The register works as follows::
@@ -384,10 +392,15 @@ The register works as follows::
LCT4: FB[i].MC[j].CE = FB[i].LCT4;
endcase
- case(FB[i].MC[j].REG_D_MUX)
- LUT: FB[i].MC[j].REG_D = FB[i].MC[j].LUT_OUT;
- IBUF: FB[i].MC[j].REG_D = FB[i].MC[j].IOB.I;
- endcase
+ if (FB[i].MC[j].REG_D_SHIFT)
+ case(FB[i].MC[j].REG_D_SHIFT_DIR)
+ UP: FB[i].MC[j].REG_D = FB[i].MC[(j - 1) % 16].REG;
+ DOWN: FB[i].MC[j].REG_D = FB[i].MC[(j + 1) % 16].REG;
+ endcase
+ else if (FB[i].MC[j].REG_D_IREG)
+ FB[i].MC[j].REG_D = FB[i].MC[j].IOB.I;
+ else
+ FB[i].MC[j].REG_D = FB[i].MC[j].LUT_OUT;
initial FB[i].MC[j].REG = 0;
@@ -427,8 +440,6 @@ The register works as follows::
FB[i].MC[j].REG = FB[i].MC[j].REG_D;
endcase
-.. todo:: there are unknown bits involved
-
Macrocell and IOB outputs
=========================
diff --git a/_static/basic.css b/_static/basic.css
index 30fee9d0..f316efcb 100644
--- a/_static/basic.css
+++ b/_static/basic.css
@@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
diff --git a/_static/doctools.js b/_static/doctools.js
index d06a71d7..4d67807d 100644
--- a/_static/doctools.js
+++ b/_static/doctools.js
@@ -4,7 +4,7 @@
*
* Base JavaScript utilities for all Sphinx HTML documentation.
*
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
diff --git a/_static/language_data.js b/_static/language_data.js
index 250f5665..367b8ed8 100644
--- a/_static/language_data.js
+++ b/_static/language_data.js
@@ -5,7 +5,7 @@
* This script contains the language-specific data used by searchtools.js,
* namely the list of stopwords, stemmer, scorer and splitter.
*
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -13,7 +13,7 @@
var stopwords = ["a", "and", "are", "as", "at", "be", "but", "by", "for", "if", "in", "into", "is", "it", "near", "no", "not", "of", "on", "or", "such", "that", "the", "their", "then", "there", "these", "they", "this", "to", "was", "will", "with"];
-/* Non-minified version is copied as a separate JS file, is available */
+/* Non-minified version is copied as a separate JS file, if available */
/**
* Porter Stemmer
diff --git a/_static/searchtools.js b/_static/searchtools.js
index 7918c3fa..92da3f8b 100644
--- a/_static/searchtools.js
+++ b/_static/searchtools.js
@@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for the full-text search.
*
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -99,7 +99,7 @@ const _displayItem = (item, searchTerms, highlightTerms) => {
.then((data) => {
if (data)
listItem.appendChild(
- Search.makeSearchSummary(data, searchTerms)
+ Search.makeSearchSummary(data, searchTerms, anchor)
);
// highlight search terms in the summary
if (SPHINX_HIGHLIGHT_ENABLED) // set in sphinx_highlight.js
@@ -116,8 +116,8 @@ const _finishSearch = (resultCount) => {
);
else
Search.status.innerText = _(
- `Search finished, found ${resultCount} page(s) matching the search query.`
- );
+ "Search finished, found ${resultCount} page(s) matching the search query."
+ ).replace('${resultCount}', resultCount);
};
const _displayNextItem = (
results,
@@ -137,6 +137,22 @@ const _displayNextItem = (
// search finished, update title and status message
else _finishSearch(resultCount);
};
+// Helper function used by query() to order search results.
+// Each input is an array of [docname, title, anchor, descr, score, filename].
+// Order the results by score (in opposite order of appearance, since the
+// `_displayNextItem` function uses pop() to retrieve items) and then alphabetically.
+const _orderResultsByScoreThenName = (a, b) => {
+ const leftScore = a[4];
+ const rightScore = b[4];
+ if (leftScore === rightScore) {
+ // same score: sort alphabetically
+ const leftTitle = a[1].toLowerCase();
+ const rightTitle = b[1].toLowerCase();
+ if (leftTitle === rightTitle) return 0;
+ return leftTitle > rightTitle ? -1 : 1; // inverted is intentional
+ }
+ return leftScore > rightScore ? 1 : -1;
+};
/**
* Default splitQuery function. Can be overridden in ``sphinx.search`` with a
@@ -160,13 +176,26 @@ const Search = {
_queued_query: null,
_pulse_status: -1,
- htmlToText: (htmlString) => {
+ htmlToText: (htmlString, anchor) => {
const htmlElement = new DOMParser().parseFromString(htmlString, 'text/html');
- htmlElement.querySelectorAll(".headerlink").forEach((el) => { el.remove() });
+ for (const removalQuery of [".headerlinks", "script", "style"]) {
+ htmlElement.querySelectorAll(removalQuery).forEach((el) => { el.remove() });
+ }
+ if (anchor) {
+ const anchorContent = htmlElement.querySelector(`[role="main"] ${anchor}`);
+ if (anchorContent) return anchorContent.textContent;
+
+ console.warn(
+ `Anchored content block not found. Sphinx search tries to obtain it via DOM query '[role=main] ${anchor}'. Check your theme or template.`
+ );
+ }
+
+ // if anchor not specified or not found, fall back to main content
const docContent = htmlElement.querySelector('[role="main"]');
- if (docContent !== undefined) return docContent.textContent;
+ if (docContent) return docContent.textContent;
+
console.warn(
- "Content block not found. Sphinx search tries to obtain it via '[role=main]'. Could you check your theme or template."
+ "Content block not found. Sphinx search tries to obtain it via DOM query '[role=main]'. Check your theme or template."
);
return "";
},
@@ -239,16 +268,7 @@ const Search = {
else Search.deferQuery(query);
},
- /**
- * execute search (requires search index to be loaded)
- */
- query: (query) => {
- const filenames = Search._index.filenames;
- const docNames = Search._index.docnames;
- const titles = Search._index.titles;
- const allTitles = Search._index.alltitles;
- const indexEntries = Search._index.indexentries;
-
+ _parseQuery: (query) => {
// stem the search terms and add them to the correct list
const stemmer = new Stemmer();
const searchTerms = new Set();
@@ -284,16 +304,32 @@ const Search = {
// console.info("required: ", [...searchTerms]);
// console.info("excluded: ", [...excludedTerms]);
- // array of [docname, title, anchor, descr, score, filename]
- let results = [];
+ return [query, searchTerms, excludedTerms, highlightTerms, objectTerms];
+ },
+
+ /**
+ * execute search (requires search index to be loaded)
+ */
+ _performSearch: (query, searchTerms, excludedTerms, highlightTerms, objectTerms) => {
+ const filenames = Search._index.filenames;
+ const docNames = Search._index.docnames;
+ const titles = Search._index.titles;
+ const allTitles = Search._index.alltitles;
+ const indexEntries = Search._index.indexentries;
+
+ // Collect multiple result groups to be sorted separately and then ordered.
+ // Each is an array of [docname, title, anchor, descr, score, filename].
+ const normalResults = [];
+ const nonMainIndexResults = [];
+
_removeChildren(document.getElementById("search-progress"));
- const queryLower = query.toLowerCase();
+ const queryLower = query.toLowerCase().trim();
for (const [title, foundTitles] of Object.entries(allTitles)) {
- if (title.toLowerCase().includes(queryLower) && (queryLower.length >= title.length/2)) {
+ if (title.toLowerCase().trim().includes(queryLower) && (queryLower.length >= title.length/2)) {
for (const [file, id] of foundTitles) {
let score = Math.round(100 * queryLower.length / title.length)
- results.push([
+ normalResults.push([
docNames[file],
titles[file] !== title ? `${titles[file]} > ${title}` : title,
id !== null ? "#" + id : "",
@@ -308,46 +344,47 @@ const Search = {
// search for explicit entries in index directives
for (const [entry, foundEntries] of Object.entries(indexEntries)) {
if (entry.includes(queryLower) && (queryLower.length >= entry.length/2)) {
- for (const [file, id] of foundEntries) {
- let score = Math.round(100 * queryLower.length / entry.length)
- results.push([
+ for (const [file, id, isMain] of foundEntries) {
+ const score = Math.round(100 * queryLower.length / entry.length);
+ const result = [
docNames[file],
titles[file],
id ? "#" + id : "",
null,
score,
filenames[file],
- ]);
+ ];
+ if (isMain) {
+ normalResults.push(result);
+ } else {
+ nonMainIndexResults.push(result);
+ }
}
}
}
// lookup as object
objectTerms.forEach((term) =>
- results.push(...Search.performObjectSearch(term, objectTerms))
+ normalResults.push(...Search.performObjectSearch(term, objectTerms))
);
// lookup as search terms in fulltext
- results.push(...Search.performTermsSearch(searchTerms, excludedTerms));
+ normalResults.push(...Search.performTermsSearch(searchTerms, excludedTerms));
// let the scorer override scores with a custom scoring function
- if (Scorer.score) results.forEach((item) => (item[4] = Scorer.score(item)));
-
- // now sort the results by score (in opposite order of appearance, since the
- // display function below uses pop() to retrieve items) and then
- // alphabetically
- results.sort((a, b) => {
- const leftScore = a[4];
- const rightScore = b[4];
- if (leftScore === rightScore) {
- // same score: sort alphabetically
- const leftTitle = a[1].toLowerCase();
- const rightTitle = b[1].toLowerCase();
- if (leftTitle === rightTitle) return 0;
- return leftTitle > rightTitle ? -1 : 1; // inverted is intentional
- }
- return leftScore > rightScore ? 1 : -1;
- });
+ if (Scorer.score) {
+ normalResults.forEach((item) => (item[4] = Scorer.score(item)));
+ nonMainIndexResults.forEach((item) => (item[4] = Scorer.score(item)));
+ }
+
+ // Sort each group of results by score and then alphabetically by name.
+ normalResults.sort(_orderResultsByScoreThenName);
+ nonMainIndexResults.sort(_orderResultsByScoreThenName);
+
+ // Combine the result groups in (reverse) order.
+ // Non-main index entries are typically arbitrary cross-references,
+ // so display them after other results.
+ let results = [...nonMainIndexResults, ...normalResults];
// remove duplicate search results
// note the reversing of results, so that in the case of duplicates, the highest-scoring entry is kept
@@ -361,7 +398,12 @@ const Search = {
return acc;
}, []);
- results = results.reverse();
+ return results.reverse();
+ },
+
+ query: (query) => {
+ const [searchQuery, searchTerms, excludedTerms, highlightTerms, objectTerms] = Search._parseQuery(query);
+ const results = Search._performSearch(searchQuery, searchTerms, excludedTerms, highlightTerms, objectTerms);
// for debugging
//Search.lastresults = results.slice(); // a copy
@@ -466,14 +508,18 @@ const Search = {
// add support for partial matches
if (word.length > 2) {
const escapedWord = _escapeRegExp(word);
- Object.keys(terms).forEach((term) => {
- if (term.match(escapedWord) && !terms[word])
- arr.push({ files: terms[term], score: Scorer.partialTerm });
- });
- Object.keys(titleTerms).forEach((term) => {
- if (term.match(escapedWord) && !titleTerms[word])
- arr.push({ files: titleTerms[word], score: Scorer.partialTitle });
- });
+ if (!terms.hasOwnProperty(word)) {
+ Object.keys(terms).forEach((term) => {
+ if (term.match(escapedWord))
+ arr.push({ files: terms[term], score: Scorer.partialTerm });
+ });
+ }
+ if (!titleTerms.hasOwnProperty(word)) {
+ Object.keys(titleTerms).forEach((term) => {
+ if (term.match(escapedWord))
+ arr.push({ files: titleTerms[term], score: Scorer.partialTitle });
+ });
+ }
}
// no match but word was a required one
@@ -496,9 +542,8 @@ const Search = {
// create the mapping
files.forEach((file) => {
- if (fileMap.has(file) && fileMap.get(file).indexOf(word) === -1)
- fileMap.get(file).push(word);
- else fileMap.set(file, [word]);
+ if (!fileMap.has(file)) fileMap.set(file, [word]);
+ else if (fileMap.get(file).indexOf(word) === -1) fileMap.get(file).push(word);
});
});
@@ -549,8 +594,8 @@ const Search = {
* search summary for a given text. keywords is a list
* of stemmed words.
*/
- makeSearchSummary: (htmlText, keywords) => {
- const text = Search.htmlToText(htmlText);
+ makeSearchSummary: (htmlText, keywords, anchor) => {
+ const text = Search.htmlToText(htmlText, anchor);
if (text === "") return null;
const textLower = text.toLowerCase();
diff --git a/genindex.html b/genindex.html
index 719782a2..8cc35bca 100644
--- a/genindex.html
+++ b/genindex.html
@@ -13,7 +13,7 @@
-
+
Fuses — macrocellsX X X X 1 0
-X X X X - X X X X -
1 1
X X X X X 2 0
@@ -141,22 +141,22 @@ Fuses — macrocells
-UNK_REG_Q [1, 0, 1]
+REG_D_IREG [1, 0, 0] Non-inverted [0]
+
+REG_D_SHIFT_DIR [1, 0, 1] UP 0 DOWN 1
IOB_ZIA_MUX [1, 0, 2] REG 0 IBUF 1
-
-UNK_SHIFT [1, 0, 3]
+REG_D_SHIFT [1, 0, 3] Non-inverted [0]
@@ -231,9 +231,9 @@ JED mapping — macrocells with IOB
12 CLK_MUX[1] 13 CLK_MUX[2] 14 REG_D_MUX 15 UNK_REG_Q 16 UNK_SHIFT 14 REG_D_IREG 15 REG_D_SHIFT_DIR 16 REG_D_SHIFT 17 IOB_ZIA_MUX 18 RST_MUX[0] 19 RST_MUX[1] JED mapping — macrocells without IOB
7 CLK_MUX[1] 8 CLK_MUX[2] 9 REG_D_MUX 10 UNK_REG_Q 11 UNK_SHIFT 9 REG_D_IREG 10 REG_D_SHIFT_DIR 11 REG_D_SHIFT 12 RST_MUX[0] 13 RST_MUX[1] 14 RST_MUX[2] Register