Skip to content

Commit

Permalink
added license
Browse files Browse the repository at this point in the history
  • Loading branch information
Siew Yi Liang committed Feb 15, 2019
1 parent 3520ff5 commit 18bf550
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 5 deletions.
29 changes: 29 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Copyright 2019 Siew Yi Liang.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

All third-party code in this repository is licensed under their own terms and
conditions, and is not affected by the terms of this license.
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# Code Repository #

All the source code for this tutorial is available [here](https://bitbucket.org/sonictk/nasm_learning).
All the source code for this tutorial is available [here](https://github.com/sonictk/asm_tutorial).


# Introduction #
Expand Down Expand Up @@ -5071,7 +5071,7 @@
* [Marco Giordano](https://twitter.com/MGDev91), for getting me into this mess
in the first place.

* [Xephyris](https://twitter.com/xephyris), for putting up with all my
* [`xephyris`](https://twitter.com/xephyris), for putting up with all my
questions, rants and nonsense, while returning none of those; just solid
knowledge and advice.

Expand Down
17 changes: 14 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
# NASM Learning
# Understanding Windows x64 Assembly code repository #

## About
## About ##

Various exercises to get familiar with programming for the x86-64 instruction set.
This repository hosts the code samples for the [accompanying tutorial](https://sonictk.github.io/asm_tutorial/).

It also contains a whole host of other samples that I was playing with when going
through [Ray Seyfarth's books](http://rayseyfarth.com/) on the subject.

## Usage ##

Please refer to the instructions in the `build.bat` script for instructions on how t
to build the examples in this repository. Folders contain their own build scripts
for their own individual projects.

## Sample ``.dir-locals.el`` files

This is what I use for when I'm programming in Emacs.

### Windows
```
(
Expand Down

0 comments on commit 18bf550

Please sign in to comment.