Skip to content

Commit 2bb6d0f

Browse files
wangnuannuanwangnuannuan
committed
Merge branch 'arc-dev' into arc-staging
2 parents 15423a1 + fd1fe07 commit 2bb6d0f

16 files changed

+187
-68
lines changed

‎doc/Makefile‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ help:
3232
@echo " applehelp to make an Apple Help Book"
3333
@echo " devhelp to make HTML files and a Devhelp project"
3434
@echo " epub to make an epub"
35-
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
36-
@echo " latexpdf to make LaTeX files and run them through pdflatex"
37-
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
3835
@echo " text to make text files"
3936
@echo " man to make manual pages"
4037
@echo " texinfo to make Texinfo files"
@@ -124,38 +121,11 @@ epub:
124121
@echo
125122
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
126123

127-
.PHONY: latex
128-
latex:
129-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
130-
@echo
131-
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
132-
@echo "Run \`make' in that directory to run these through (pdf)latex" \
133-
"(use \`make latexpdf' here to do that automatically)."
134-
135-
# Sphinx PDF requires newfloat.sty, which is not available on CentOS. Therefore
136-
# it is part of this distribution and is copied to the build directory in the
137-
# Makefile.
138-
.PHONY: latexpdf
139-
latexpdf:
140-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
141-
@echo "Running LaTeX files through pdflatex..."
142-
mkdir -p $(BUILDDIR)/latex
143-
cp -a newfloat.sty $(BUILDDIR)/latex
144-
$(MAKE) -C $(BUILDDIR)/latex all-pdf
145-
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
146-
147124
.PHONY: pdf
148125
pdf:
149126
$(SPHINXBUILD) -b pdf $(ALLSPHINXOPTS) $(BUILDDIR)/pdf
150127
@echo "Pdf build finished; the PDF files are in $(BUILDDIR)/pdf."
151128

152-
.PHONY: latexpdfja
153-
latexpdfja:
154-
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
155-
@echo "Running LaTeX files through platex and dvipdfmx..."
156-
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
157-
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
158-
159129
.PHONY: text
160130
text:
161131
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text

‎doc/_styles/synopsys.style‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
fontsAlias:
2+
stdBold: Times-Bold
3+
stdBoldItalic: Times-BoldItalic
4+
stdFont: Times-Roman
5+
stdItalic: Times-Italic
6+
stdHeader: Helvetica-Bold
7+
8+
styles:
9+
normal:
10+
fontSize: 10
11+
12+
bodytext:
13+
alignment: TA_LEFT
14+
15+
titleslideinfo:
16+
parent: normal
17+
alignment: TA_CENTER
18+
19+
literal:
20+
textColor: #000000
21+
hyphenation: false
22+
23+
code:
24+
parent: literal
25+
fontSize: 8
26+
leftIndent: 0
27+
spaceBefore: 8
28+
spaceAfter: 8
29+
30+
envvar:
31+
parent:literal
32+
33+
file:
34+
parent: normal
35+
36+
option:
37+
parent: normal
38+
39+
desc:
40+
parent: normal
41+
42+
descname:
43+
parent: normal
44+
45+
descclassname:
46+
parent: normal
47+
48+
std:
49+
parent: normal
50+
51+
xref:
52+
parent: normal
53+
54+
doc:
55+
parent: normal
56+
57+
heading1:
58+
parent: heading
59+
fontName: stdHeader
60+
fontSize: 175%
61+
62+
heading2:
63+
parent: heading
64+
fontName: stdHeader
65+
fontSize: 150%
66+
67+
heading3:
68+
parent: heading
69+
fontName: stdHeader
70+
fontSize: 125%
71+
72+
heading4:
73+
parent: heading
74+
fontName: stdHeader
75+
76+
title:
77+
parent: heading
78+
fontName: stdHeader
79+
fontSize: 200%
80+
alignment: TA_LEFT
81+
keepWithNext: false
82+
spaceAfter: 10
83+
84+
author:
85+
parent: normal
86+
alignment: TA_RIGHT
87+
88+
date:
89+
parent: normal
90+
alignment: TA_RIGHT
91+
92+
titleimage:
93+
parent: image
94+
alignment: TA_LEFT
95+
scale: 60%

‎doc/_templates/synopsys.tmpl‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.. role:: normal
2+
3+
.. image:: arc.png
4+
:scale: 50%
5+
:align: left
6+
7+
{% if title: %}
8+
9+
.. cssclass:: title
10+
11+
{{title}}
12+
13+
{% endif %}
14+
15+
{% if subtitle: %}
16+
17+
.. cssclass:: subtitle
18+
19+
{{subtitle}}
20+
21+
{% endif %}
22+
23+
.. raw:: pdf
24+
25+
Spacer 0 15cm
26+
27+
{% for author in authors: %}
28+
29+
.. cssclass:: author
30+
31+
:normal:`{{author}}`
32+
33+
{% endfor %}
34+
35+
.. raw:: pdf
36+
37+
.. cssclass:: author
38+
39+
:normal:`{{date}}`
40+
41+
.. raw:: pdf
42+
43+
OddPageBreak

‎doc/arc.png‎

39.5 KB
Loading

‎doc/baremetal/em-starter-kit.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ Connecting GDB to OpenOCD
161161
Write a sample application:
162162

163163
.. code-block:: c
164-
:linenos:
165164
166165
/* simple.c */
167166
int main(void) {

‎doc/baremetal/linker.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ It also specifies parameters of heap and stack sections.
7979
For example, here is a sample ``memory.x`` map for ``hs34.tcf`` template:
8080

8181
.. code-block:: text
82-
:linenos:
8382
8483
MEMORY {
8584
ICCM0 : ORIGIN = 0x00000000, LENGTH = 0x00004000

‎doc/conf.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313
]
314314

315315
# A comma-separated list of custom stylesheets. Example:
316-
pdf_stylesheets = ['sphinx','a4','freetype-serif']
316+
pdf_stylesheets = ['synopsys.style']
317317

318318
# A list of folders to search for stylesheets. Example:
319319
pdf_style_path = ['.', '_styles']
@@ -331,7 +331,7 @@
331331

332332
# Mode for literal blocks wider than the frame. Can be
333333
# overflow, shrink or truncate
334-
#pdf_fit_mode = "shrink"
334+
pdf_fit_mode = "truncate"
335335

336336
# Section level that forces a break page.
337337
# For example: 1 means top-level sections start in a new page
@@ -344,22 +344,22 @@
344344

345345
# Insert footnotes where they are defined instead of
346346
# at the end.
347-
#pdf_inline_footnotes = True
347+
pdf_inline_footnotes = True
348348

349349
# verbosity level. 0 1 or 2
350350
#pdf_verbosity = 0
351351

352352
# If false, no index is generated.
353-
#pdf_use_index = True
353+
pdf_use_index = True
354354

355355
# If false, no modindex is generated.
356356
#pdf_use_modindex = True
357357

358358
# If false, no coverpage is generated.
359-
#pdf_use_coverpage = True
359+
pdf_use_coverpage = True
360360

361361
# Name of the cover page template to use
362-
#pdf_cover_template = 'sphinxcover.tmpl'
362+
pdf_cover_template = '_templates/synopsys.tmpl'
363363

364364
# Documents to append as an appendix to all manuals.
365365
#pdf_appendices = []
@@ -385,10 +385,11 @@
385385
pdf_toc_depth = 2
386386

387387
# Add section number to section references
388-
pdf_use_numbered_links = False
388+
pdf_use_numbered_links = True
389389

390390
# Background images fitting mode
391391
pdf_fit_background_mode = 'scale'
392392

393393
# Repeat table header on tables that cross a page boundary?
394394
pdf_repeat_table_rows = True
395+

‎doc/gcc/apex.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ The ARChitect2 tool generates a special header file when APEX instructions are
77
specified/selected in ARChitect. Such an example can be:
88

99
.. code-block:: c
10-
:linenos:
1110
1211
/* **** DO NOT EDIT - this file is generated by ARChitect2 ****
1312
*
@@ -138,7 +137,6 @@ GNU header
138137
----------
139138

140139
.. code-block:: c
141-
:linenos:
142140
143141
#ifndef _apexextensions_H_
144142
#define _apexextensions_H_

‎doc/gcc/custom-instructions.rst‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@ Example 1
9191
.. Using nasm here instead of asm, because asm doesn't recognize OR symbol.
9292
9393
.. code-block:: nasm
94-
:linenos:
9594
9695
.extInstruction insn1, 0x07, 0x2d, SUFFIX_NONE, SYNTAX_3OP|OP1_MUST_BE_IMM
9796
9897
9998
will allow us the following syntax:
10099

101100
.. code-block:: asm
102-
:linenos:
103101
104102
insn1 0,b,c
105103
insn1 0,b,u6
@@ -111,15 +109,13 @@ Example 2
111109
^^^^^^^^^
112110

113111
.. code-block:: nasm
114-
:linenos:
115112
116113
.extInstruction insn2, 0x07, 0x2d, SUFFIX_NONE, SYNTAX_2OP|OP1_IMM_IMPLIED
117114
118115
119116
will allow us the following syntax:
120117

121118
.. code-block:: asm
122-
:linenos:
123119
124120
insn2 b,c
125121
insn2 b,u6
@@ -135,7 +131,6 @@ Example 3
135131
^^^^^^^^^
136132

137133
.. code-block:: asm
138-
:linenos:
139134
140135
.extInstruction insn1, 7, 0x21, SUFFIX_NONE, SYNTAX_3OP
141136
.extInstruction insn2, 7, 0x21, SUFFIX_NONE, SYNTAX_2OP
@@ -151,7 +146,6 @@ Example 3
151146
will result in the following encodings:
152147

153148
.. code-block:: objdump
154-
:linenos:
155149
156150
Disassembly of section .text:
157151

‎doc/gcc/extensions-support.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ GCC's support for ARC custom extensions
22
=======================================
33

44
.. highlight:: c
5-
:linenothreshold: 5
65

76
The ARC extension instructions are supported by GNU toolchain by the GNU
87
assembler. These extension instructions are not macros; the assembler creates

0 commit comments

Comments
 (0)